diff --git a/config/alfresco/model/calendarModel.xml b/config/alfresco/model/calendarModel.xml
index efbdaba6de..405609cfe6 100644
--- a/config/alfresco/model/calendarModel.xml
+++ b/config/alfresco/model/calendarModel.xml
@@ -71,6 +71,14 @@
             <property name="ia:isOutlook">
                <type>d:boolean</type>
             </property>
+            <property name="ia:outlookUID">
+               <title>Outlook UID</title>
+               <type>d:text</type>               
+               <mandatory>false</mandatory>               
+               <index enabled="true">
+                  <tokenised>false</tokenised>
+               </index>			               
+            </property>
          </properties>
          <associations>
             <child-association name="ia:ignoreEventList">
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 9940dbd69d..0db313cb7b 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -82,6 +82,7 @@ import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.cmr.workflow.WorkflowInstance;
 import org.alfresco.service.cmr.workflow.WorkflowService;
+import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespacePrefixResolverProvider;
 import org.alfresco.service.namespace.NamespaceService;
@@ -2809,8 +2810,18 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
                                = new LinkedHashMap<String, Serializable>(nodeProperties.size());
                        for (QName nextLongQName : nodeProperties.keySet())
                        {
-                           String nextShortQName = getShortQName(nextLongQName);
-                           nodePropertiesShortQNames.put(nextShortQName, nodeProperties.get(nextLongQName));
+                           try
+                           {
+                               String nextShortQName = getShortQName(nextLongQName);
+                               nodePropertiesShortQNames.put(nextShortQName, nodeProperties.get(nextLongQName));
+                           }
+                           catch (NamespaceException ne)
+                           {
+                               // ignore properties that do not have a registered namespace
+                               
+                               if (logger.isDebugEnabled())
+                                   logger.debug("Ignoring property '" + nextLongQName + "' as it's namespace is not registered");
+                           }
                        }
                        json.put("properties", nodePropertiesShortQNames);
                    }