diff --git a/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanelCommands.cpp b/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanelCommands.cpp
index 78545829..7bc19443 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanelCommands.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanelCommands.cpp
@@ -49,7 +49,8 @@ namespace SHADE
     data.createdEntities.clear();
     data.createdEntities = SHSerialization::DeserializeEntitiesFromString(data.entityData, data.parentEID);
     data.entityData = SHSerialization::ResolveSerializedEntityIndices(data.entityData, data.createdEntities);
-    SHEditorWindowManager::GetEditorWindow<SHHierarchyPanel>()->SetScrollTo(data.createdEntities.begin()->second);
+    if(!data.createdEntities.empty())
+      SHEditorWindowManager::GetEditorWindow<SHHierarchyPanel>()->SetScrollTo(data.createdEntities.begin()->second);
   }
 
   void SHPasteEntitiesCommand::Undo()