diff --git a/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java b/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
index c44189a3dd..8631939bb5 100644
--- a/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/audit/AbstractAuditDAOImpl.java
@@ -398,6 +398,11 @@ public abstract class AbstractAuditDAOImpl implements AuditDAO
                     logger.warn("Audit entry not linked to a Map<String, Serializable> value: " + row);
                     return;
                 }
+                catch (Throwable e)
+                {
+                    logger.warn("Audit entry unable to extract audited values: " + row, e);
+                    return;
+                }
                 if (auditValues == null)
                 {
                     logger.warn("Audit entry incompletely joined to audit properties: " + row);