diff --git a/trinity/Eve/EveSpaceScene.cpp b/trinity/Eve/EveSpaceScene.cpp
index f5211d826..dad66eb2d 100644
--- a/trinity/Eve/EveSpaceScene.cpp
+++ b/trinity/Eve/EveSpaceScene.cpp
@@ -299,6 +299,8 @@ EveSpaceScene::EveSpaceScene( IRoot* lockobj ) :
 	m_combinedPostProcessAttributes.CreateInstance();
 
 	m_instancedMeshManager = std::make_unique<EveInstancedMeshManager>();
+
+	PrepareResources();
 }
 
 IRoot* EveSpaceScene::GetCameraAttachments() const
diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp
index 70dcded12..96458cc17 100644
--- a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp
+++ b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp
@@ -1246,6 +1246,10 @@ void EveSpaceObject2::GetBatchesFromOverlayVector( ITriRenderBatchAccumulator* b
 		return;
 	}
 
+	if( !mesh )
+	{
+		return;
+	}
 	TriGeometryRes* geomRes = mesh->GetGeometryResource();
 	if( !geomRes || !geomRes->IsGood() )
 	{