diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
index 7d6fd83add..375d8c0cdb 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
@@ -1042,7 +1042,12 @@ public class AVMStoreImpl implements AVMStore, Serializable
      */
     public PropertyValue getProperty(QName name)
     {
-        return AVMContext.fgInstance.fAVMStorePropertyDAO.get(this, name).getValue();
+        AVMStoreProperty prop = AVMContext.fgInstance.fAVMStorePropertyDAO.get(this, name);
+        if (prop == null)
+        {
+            return null;
+        }
+        return prop.getValue();
     }
     
     /**