diff --git a/source/java/org/alfresco/repo/domain/hibernate/AppliedPatchImpl.java b/source/java/org/alfresco/repo/domain/hibernate/AppliedPatchImpl.java
index 15c2d5cac3..75e4140e55 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/AppliedPatchImpl.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/AppliedPatchImpl.java
@@ -77,7 +77,7 @@ public class AppliedPatchImpl implements AppliedPatch
     }
     public void setDescription(String description)
     {
-        if (description.length() > 1024)
+        if (description != null && description.length() > 1024)
         {
             // truncate as necessary
             description = (description.substring(0, 1020) + "...");
@@ -155,7 +155,7 @@ public class AppliedPatchImpl implements AppliedPatch
     }
     public void setReport(String report)
     {
-        if (report.length() > 1024)
+        if (report != null && report.length() > 1024)
         {
             // truncate as necessary
             report = (report.substring(0, 1020) + "...");