diff --git a/src/external/blizzard-database-library b/src/external/blizzard-database-library
index b0bd5d27..8e277380 160000
--- a/src/external/blizzard-database-library
+++ b/src/external/blizzard-database-library
@@ -1 +1 @@
-Subproject commit b0bd5d27327fa00046e1529a0b347af3bd2cc9dc
+Subproject commit 8e27738046e944065796764cb92361422901e505
diff --git a/src/noggit/DBCFile.cpp b/src/noggit/DBCFile.cpp
index 98a86686..9f1845f3 100755
--- a/src/noggit/DBCFile.cpp
+++ b/src/noggit/DBCFile.cpp
@@ -45,9 +45,14 @@ void DBCFile::open(std::shared_ptr<BlizzardArchive::ClientData> clientData)
   f.read(&recordSize, 4);
   f.read(&stringSize, 4);
 
+  if (!fieldCount || !recordSize)
+  {
+    throw std::logic_error("DBC error, field count or record size is 0 : " + filename);
+  }
+
   if (fieldCount * 4 != recordSize)
   {
-    throw std::logic_error ("non four-byte-columns not supported");
+    throw std::logic_error ("non four-byte-columns not supported : " + filename);
   }
 
   data.resize (recordSize * recordCount);
@@ -89,7 +94,8 @@ void DBCFile::save()
 
 DBCFile::Record DBCFile::addRecord(size_t id, size_t id_field)
 {
-  recordCount++;
+  assert(recordSize > 0);
+  assert(id_field < fieldCount);
 
   for (Iterator i = begin(); i != end(); ++i)
   {
@@ -101,6 +107,8 @@ DBCFile::Record DBCFile::addRecord(size_t id, size_t id_field)
   data.resize(old_size + recordSize);
   *reinterpret_cast<unsigned int*>(data.data() + old_size + id_field * sizeof(std::uint32_t)) = static_cast<unsigned int>(id);
 
+  recordCount++;
+
   return Record(*this, data.data() + old_size);
 }
 
@@ -144,8 +152,12 @@ DBCFile::Record DBCFile::addRecordCopy(size_t id, size_t id_from, size_t id_fiel
 
 void DBCFile::removeRecord(size_t id, size_t id_field)
 {
-  recordCount--;
-  size_t counter = 0;
+  if (recordCount == 0)
+  {
+    throw NotFound();
+  }
+
+  size_t row_counter = 0;
 
   for (Iterator i = begin(); i != end(); ++i)
   {
@@ -153,13 +165,34 @@ void DBCFile::removeRecord(size_t id, size_t id_field)
     {
       size_t initial_size = data.size();
 
-      unsigned char* record = data.data() + counter * recordSize;
-      std::memmove(record, record + recordSize, recordSize * (recordCount - counter + 1));
+      size_t row_position = row_counter * recordSize; // position of the record to remove
+
+      size_t datasizeafterRow = recordSize * (recordCount - row_counter); // size of the data after the row that needs to be moved at the old row's position
+
+      // assert(initial_size >= (datasizeafterRow + row_position));
+      if ((row_position + datasizeafterRow) > initial_size)
+      {
+        throw std::out_of_range("Attempting to remove more data than available");
+      }
+
+      // size_t numRecordsToMove = recordCount - row_counter; // Number of records to move down
+
+      unsigned char* record = data.data() + row_position; // data to remove at position
+
+      // Move all data after the row to the row's position
+      // only do it if it wasn't the last row
+      if (row_position + recordSize < initial_size)
+      {
+        assert(row_counter < recordCount);
+        std::memmove(record, record + recordSize, datasizeafterRow);
+      }
       data.resize(initial_size - recordSize);
+
+      recordCount--;
       return;
     }
 
-    counter++;
+    row_counter++;
 
   }
 
diff --git a/src/noggit/ModelHeaders.h b/src/noggit/ModelHeaders.h
index 8f2be807..89aff8b8 100755
--- a/src/noggit/ModelHeaders.h
+++ b/src/noggit/ModelHeaders.h
@@ -219,8 +219,8 @@ struct ModelRenderFlags {
     uint16_t unlit : 1;
     uint16_t unfogged : 1;
     uint16_t two_sided : 1;
-    uint16_t billboard : 1;
-    uint16_t z_buffered : 1;
+    uint16_t billboard : 1; // depthTest
+    uint16_t z_buffered : 1; // depthWrite
     uint16_t unused : 11;
   }flags;
   uint16_t blend;
diff --git a/src/noggit/rendering/ModelRender.cpp b/src/noggit/rendering/ModelRender.cpp
index d869a788..8470bbf7 100755
--- a/src/noggit/rendering/ModelRender.cpp
+++ b/src/noggit/rendering/ModelRender.cpp
@@ -439,6 +439,9 @@ void ModelRender::fixShaderIDLayer()
 
         first_pass = &pass;
       }
+      assert(first_pass);
+      if (first_pass == nullptr)
+        return;
 
       bool xor_unlit = ((_model->_render_flags[pass.renderflag_index].flags.unlit ^ _model->_render_flags[first_pass->renderflag_index].flags.unlit) & 1) == 0;
 
diff --git a/src/noggit/wmo_liquid.hpp b/src/noggit/wmo_liquid.hpp
index 5df2fc6e..5f94e638 100755
--- a/src/noggit/wmo_liquid.hpp
+++ b/src/noggit/wmo_liquid.hpp
@@ -45,7 +45,7 @@ struct WMOMaterial
       uint32_t unfogged : 1;
       uint32_t unculled : 1;
       uint32_t ext_light: 1; // darkened used for the intern face of windows
-      uint32_t sidn :  1;
+      uint32_t sidn :  1; // night glow
       uint32_t window :  1; // lighting related(flag checked in CMapObj::UpdateSceneMaterials)
       uint32_t clamp_s :  1;
       uint32_t clamp_t : 1;