diff --git a/src/Components/Modules/ModelSurfs.cpp b/src/Components/Modules/ModelSurfs.cpp
index 83cc4583..3a9839ab 100644
--- a/src/Components/Modules/ModelSurfs.cpp
+++ b/src/Components/Modules/ModelSurfs.cpp
@@ -194,14 +194,14 @@ namespace Components
 					auto buffer = ModelSurfs::BufferMap.find(surface->triIndices);
 					if (buffer != ModelSurfs::BufferMap.end())
 					{
-						buffer->second->Release();
+						if(buffer->second) buffer->second->Release();
 						ModelSurfs::BufferMap.erase(buffer);
 					}
 
 					buffer = ModelSurfs::BufferMap.find(surface->verts0);
 					if (buffer != ModelSurfs::BufferMap.end())
 					{
-						buffer->second->Release();
+						if (buffer->second) buffer->second->Release();
 						ModelSurfs::BufferMap.erase(buffer);
 					}
 				}