diff --git a/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 873fd3a753..df526c6067 100644
--- a/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/repository/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -2004,6 +2004,11 @@ public class SchemaBootstrap extends AbstractLifecycleBean
             return null;
         }
 
+        if (!(result instanceof Difference))
+        {
+            return null;
+        }
+
         return differenceHelper.findPatchCausingDifference((Difference)result);
     }