diff --git a/SDK/include/NDK/World.inl b/SDK/include/NDK/World.inl
index 3040e3d6c..a9e22774b 100644
--- a/SDK/include/NDK/World.inl
+++ b/SDK/include/NDK/World.inl
@@ -136,7 +136,10 @@ namespace Ndk
 
 		// And then update systems
 		for (auto& systemPtr : m_systems)
-			systemPtr->Update(elapsedTime);
+		{
+			if (systemPtr)
+				systemPtr->Update(elapsedTime);
+		}
 	}
 
 	inline void World::Invalidate()
diff --git a/SDK/src/NDK/World.cpp b/SDK/src/NDK/World.cpp
index 8db940558..7ee1fde49 100644
--- a/SDK/src/NDK/World.cpp
+++ b/SDK/src/NDK/World.cpp
@@ -132,6 +132,10 @@ namespace Ndk
 			{
 				for (auto& system : m_systems)
 				{
+					// Ignore non-existent systems
+					if (!system)
+						continue;
+
 					// L'entité est-elle enregistrée comme faisant partie du système ?
 					bool partOfSystem = system->HasEntity(entity);