diff --git a/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp b/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
index e7eed326..b1248509 100644
--- a/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
+++ b/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
@@ -630,19 +630,17 @@ namespace SHADE
       auto* rigidBodyComponent = SHComponentManager::GetComponent_s<SHRigidBodyComponent>(ENTITY_ID);
       auto* colliderComponent = SHComponentManager::GetComponent_s<SHColliderComponent>(ENTITY_ID);
 
-      SHASSERT(physicsObject != nullptr, "Physics object " + std::to_string(ENTITY_ID) + " has been lost from the world!")
-
-      if (REMOVED_ID == RIGID_BODY_ID)
+      // Wake up all physics objects
+      for (auto& [entityID, object] : map)
       {
-        // Wake up all physics objects
-        for (auto& [entityID, object] : map)
-        {
-          if (SHComponentManager::HasComponent<SHRigidBodyComponent>(entityID))
-            reinterpret_cast<rp3d::RigidBody*>(object.rp3dBody)->setIsSleeping(false);
-        }
+        if (SHComponentManager::HasComponent<SHRigidBodyComponent>(entityID))
+          reinterpret_cast<rp3d::RigidBody*>(object.rp3dBody)->setIsSleeping(false);
+      }
 
+      if (REMOVED_ID == RIGID_BODY_ID && physicsObject != nullptr)
+      {
         world->destroyRigidBody(reinterpret_cast<rp3d::RigidBody*>(physicsObject->rp3dBody));
-        physicsObject->rp3dBody       = nullptr;
+        physicsObject->rp3dBody = nullptr;
 
         if (colliderComponent != nullptr)
         {
@@ -657,7 +655,7 @@ namespace SHADE
         }
       }
 
-      if (REMOVED_ID == COLLIDER_ID)
+      if (REMOVED_ID == COLLIDER_ID && physicsObject != nullptr)
       {
         // Remove all colliders
         const int NUM_COLLIDERS = static_cast<int>(physicsObject->rp3dBody->getNbColliders());
@@ -673,8 +671,8 @@ namespace SHADE
           physicsObject->rp3dBody = nullptr;
       }
 
-      if (physicsObject->rp3dBody == nullptr)
-          DestroyPhysicsObject(ENTITY_ID);
+      if (physicsObject != nullptr && physicsObject->rp3dBody == nullptr)
+        DestroyPhysicsObject(ENTITY_ID);
     }
 
     return EVENT_DATA->handle;