diff --git a/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java b/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java
index 5427904496..98ce5ac650 100644
--- a/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java
+++ b/source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptor.java
@@ -345,11 +345,11 @@ public class NodeRefPropertyMethodInterceptor implements MethodInterceptor
                                     QName type = nodeService.getType(test);
                                     if (dictionaryService.isSubClass(type, ContentModel.TYPE_CATEGORY))
                                     {
-                                        return inboundValue;
+                                        return test;
                                     }
                                     else
                                     {
-                                        return null;
+                                        return test;
                                     }
                                 }
                                 else