diff --git a/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java
index 4521718..d3cb5c9 100644
--- a/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java
+++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java
@@ -140,6 +140,7 @@ private boolean deletedGlueIfParentMarkedForDeletion(Context<Glue> context, Glue
   private UpdateControl<Glue> removeErrorMessageFromGlueStatusIfPresent(Glue primary) {
     if (primary.getStatus() != null && primary.getStatus().getErrorMessage() != null) {
       primary.getStatus().setErrorMessage(null);
+      primary.getMetadata().setResourceVersion(null);
       return UpdateControl.patchStatus(primary);
     } else {
       return UpdateControl.noUpdate();
@@ -274,8 +275,10 @@ private void patchRelatedResourcesStatus(Context<Glue> context,
           genericTemplateHandler.processTemplate(actualData, template, objectTemplate);
       var statusObjectMap = GenericTemplateHandler.parseTemplateToMapObject(resultTemplate);
       relatedResources.forEach((n, kr) -> {
-        kr.setAdditionalProperty("status", statusObjectMap);
-        context.getClient().resource(kr).patchStatus();
+        if (kr != null) {
+          kr.setAdditionalProperty("status", statusObjectMap);
+          context.getClient().resource(kr).patchStatus();
+        }
       });
     });