diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
index 77d530307e..846510c9ea 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
@@ -2709,8 +2709,25 @@ private void repairMeanings(AtlasVertex assetVertex) {
     }
     @Override
     public void repairAlias(String guid) throws AtlasBaseException {
-        // Fetch entity with extenfo
+        // Fetch entity with extInfo
         AtlasEntity.AtlasEntityWithExtInfo entity = entityRetriever.toAtlasEntityWithExtInfo(guid);
+
+        if (entity == null) {
+            throw new AtlasBaseException(AtlasErrorCode.INSTANCE_GUID_NOT_FOUND, guid);
+        }
+
+        // Validate entity status
+        if (entity.getEntity().getStatus() != ACTIVE) {
+            throw new AtlasBaseException(AtlasErrorCode.INSTANCE_GUID_DELETED, guid);
+        }
+
+        // Validate entity type
+        String entityType = entity.getEntity().getTypeName();
+        if (!PERSONA_ENTITY_TYPE.equals(entityType)) {
+            throw new AtlasBaseException(AtlasErrorCode.INVALID_OBJECT_ID, entityType);
+        }
+
+        // Rebuild alias
         this.esAliasStore.rebuildAlias(entity);
     }
 }