From a5e11efda12c0d50df754b8999feac61ecaae516 Mon Sep 17 00:00:00 2001
From: nvsickle <nvsickle@amazon.com>
Date: Mon, 8 Nov 2021 16:21:35 -0800
Subject: [PATCH] Add a safety check to Prefab/PrefabPublicHandler (potential
 AR fix)

Signed-off-by: nvsickle <nvsickle@amazon.com>
---
 .../AzToolsFramework/Prefab/PrefabPublicHandler.cpp           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 5ac9f772dc..32600853fd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -1144,6 +1144,10 @@ namespace AzToolsFramework
 
             AZ::EntityId firstEntityIdToDelete = entityIdsNoFocusContainer[0];
             InstanceOptionalReference commonOwningInstance = GetOwnerInstanceByEntityId(firstEntityIdToDelete);
+            if (!commonOwningInstance.has_value())
+            {
+                return AZ::Failure(AZStd::string("Cannot delete entities belonging to an invalid instance"));
+            }
 
             // If the first entity id is a container entity id, then we need to mark its parent as the common owning instance because you
             // cannot delete an instance from itself.