diff --git a/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java b/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java
index 3e7b61f091..ec3d973fdf 100644
--- a/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java
+++ b/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java
@@ -207,7 +207,14 @@ public class HibernateAuditDAO extends HibernateDaoSupport implements AuditDAO,
         }
         else
         {
-            return o.toString();
+            try
+            {
+               return o.toString();
+            }
+            catch(Throwable t)
+            {
+                return "Throwable in toString implementation for "+o.getClass() + " was "+t.getMessage();
+            }
         }
     }