diff --git a/GlitchyEngine/src/World/Scene.bf b/GlitchyEngine/src/World/Scene.bf
index a2e2feb..4fcf308 100644
--- a/GlitchyEngine/src/World/Scene.bf
+++ b/GlitchyEngine/src/World/Scene.bf
@@ -106,7 +106,9 @@ namespace GlitchyEngine.World
 			for (let (handle, script) in target._ecsWorld.Enumerate<ScriptComponent>())
 			{
 				Entity entity = .(handle, this);
-				ScriptEngine.CopyEditorFieldsToInstance(entity, script);
+
+				if (script.Instance != null)
+					ScriptEngine.CopyEditorFieldsToInstance(entity, script);
 			}
 
 			// Copy transforms... needs special handling for the Parent<->Child relations
@@ -284,6 +286,9 @@ namespace GlitchyEngine.World
 						if (!script.IsInitialized)
 							ScriptEngine.InitializeInstance(Entity(entity, this), script);
 
+						if (script.Instance == null)
+							continue;
+
 						if (mode.HasFlag(.Runtime))
 							script.Instance.InvokeOnCreate();
 					}