diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Particles/SHParticleEmitterComponent.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Particles/SHParticleEmitterComponent.cpp
index 8aa28e58..74eb3727 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Particles/SHParticleEmitterComponent.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Particles/SHParticleEmitterComponent.cpp
@@ -14,12 +14,23 @@ namespace SHADE
 
   void SHParticleEmitterComponent::OnDestroy(void)
   {
-    emitterData.Free();
-    particleData.Free();
-    freelistData.Free();
-    indicesData.Free();
-    drawCallData.Free();
-    particleDescriptorSet.Free();
+    if (emitterData)
+      emitterData.Free();
+
+    if (particleData)
+      particleData.Free();
+
+    if (freelistData)
+      freelistData.Free();
+
+    if (indicesData)
+      indicesData.Free();
+
+    if (drawCallData)
+      drawCallData.Free();
+
+    if (particleDescriptorSet)
+      particleDescriptorSet.Free();
   }
 
   void SHParticleEmitterComponent::Emit(void) noexcept