diff --git a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
index eacc858f489800..0287c14f19cda3 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
@@ -747,10 +747,12 @@ public String ingestProposal(
             .mcps(List.of(metadataChangeProposal), auditStamp, entityService)
             .build();
 
-    IngestResult one = entityService.ingestProposal(batch, async).stream().findFirst().get();
+    Optional<IngestResult> one = entityService.ingestProposal(batch, async).stream().findFirst();
 
-    Urn urn = one.getUrn();
-    tryIndexRunId(urn, metadataChangeProposal.getSystemMetadata());
+    Urn urn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
+    if (one.isPresent()) {
+      tryIndexRunId(urn, metadataChangeProposal.getSystemMetadata());
+    }
     return urn.toString();
   }
 
diff --git a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
index a84afefb57c829..2f1e27dbe2575b 100644
--- a/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
+++ b/metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
@@ -253,11 +253,11 @@ public Task<String> ingestProposal(
         Set<IngestResult> results =
                 _entityService.ingestProposal(batch, asyncBool);
 
-            IngestResult one = results.stream().findFirst().get();
+            java.util.Optional<IngestResult> one = results.stream().findFirst();
 
             // Update runIds, only works for existing documents, so ES document must exist
-            Urn resultUrn = one.getUrn();
-            if (one.isProcessedMCL() || one.isUpdate()) {
+            Urn resultUrn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
+            if (one.map(result -> result.isProcessedMCL() || result.isUpdate()).orElse(false)) {
               tryIndexRunId(
                   resultUrn, metadataChangeProposal.getSystemMetadata(), entitySearchService);
             }