diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java
index 274af91ec0e..8da91bea1ba 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/provider/IdentityProviderEndpoints.java
@@ -218,9 +218,13 @@ public ResponseEntity<IdentityProvider> updateIdentityProvider(@PathVariable Str
             final IdentityProvider updatedOriginalIdp = identityProviderProvisioning.update(body, zoneId);
             return ensureConsistencyOfMirroredIdp(updatedOriginalIdp);
         });
-
+        if (updatedIdp == null) {
+            logger.error("IdentityProvider[origin=" + body.getOriginKey() + "; zone=" + body.getIdentityZoneId() + "] - Transaction updating IdP and mirrored IdP was not successful, but no exception was thrown.");
+            return new ResponseEntity<>(body, UNPROCESSABLE_ENTITY);
+        }
         updatedIdp.setSerializeConfigRaw(rawConfig);
         redactSensitiveData(updatedIdp);
+
         return new ResponseEntity<>(updatedIdp, OK);
     }