diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
index ef4e8f29fb..5de7713f4c 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtension.java
@@ -70,15 +70,15 @@ public class VirtualPermissionServiceExtension extends
 
     public AccessStatus hasPermission(NodeRef nodeRef, String perm)
     {
-        PermissionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        PermissionServiceTrait theTrait = getTrait();
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.hasPermission(nodeRef,
                                           perm);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             AccessStatus virtualAccessStatus = smartStore.hasPermission(reference,
                                                                         perm);
             if (!AccessStatus.UNDETERMINED.equals(virtualAccessStatus))
@@ -103,15 +103,15 @@ public class VirtualPermissionServiceExtension extends
 
     public AccessStatus hasPermission(NodeRef nodeRef, PermissionReference perm)
     {
-        PermissionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        PermissionServiceTrait theTrait = getTrait();
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.hasPermission(nodeRef,
                                           perm);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             AccessStatus virtualAccessStatus = smartStore.hasPermission(reference,
                                                                         perm);
             if (!AccessStatus.UNDETERMINED.equals(virtualAccessStatus))
@@ -148,8 +148,9 @@ public class VirtualPermissionServiceExtension extends
 
     @Override
     public Set<PermissionReference> getSettablePermissionReferences(NodeRef nodeRef)
-    {
-        if (!Reference.isReference(nodeRef))
+    {
+    	Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return getTrait().getSettablePermissionReferences(nodeRef);
         }
@@ -162,14 +163,14 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public NodePermissionEntry getSetPermissions(NodeRef nodeRef)
     {
-        PermissionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        PermissionServiceTrait theTrait = getTrait();
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.getSetPermissions(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodePermissionEntry virtualSetPermissions = smartStore.getSetPermissions(reference);
 
             NodeRef nodeToAdhereTo = establishPermisisonAdherence(reference);
@@ -234,7 +235,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void deletePermissions(NodePermissionEntry nodePermissionEntry)
     {
-        if (!Reference.isReference(nodePermissionEntry.getNodeRef()))
+        if (Reference.fromNodeRef(nodePermissionEntry.getNodeRef()) == null)
         {
             getTrait().deletePermissions(nodePermissionEntry);
         }
@@ -247,7 +248,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void deletePermission(PermissionEntry permissionEntry)
     {
-        if (!Reference.isReference(permissionEntry.getNodeRef()))
+        if (Reference.fromNodeRef(permissionEntry.getNodeRef()) == null)
         {
             getTrait().deletePermission(permissionEntry);
         }
@@ -260,7 +261,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void setPermission(PermissionEntry permissionEntry)
     {
-        if (!Reference.isReference(permissionEntry.getNodeRef()))
+        if (Reference.fromNodeRef(permissionEntry.getNodeRef())==null)
         {
             getTrait().setPermission(permissionEntry);
         }
@@ -273,7 +274,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void setPermission(NodePermissionEntry nodePermissionEntry)
     {
-        if (!Reference.isReference(nodePermissionEntry.getNodeRef()))
+        if (Reference.fromNodeRef(nodePermissionEntry.getNodeRef()) == null)
         {
             getTrait().setPermission(nodePermissionEntry);
         }
@@ -334,14 +335,14 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public Set<AccessPermission> getPermissions(NodeRef nodeRef)
     {
-        PermissionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        PermissionServiceTrait theTrait = getTrait();
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.getPermissions(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             Set<AccessPermission> virtualSetPermissions = smartStore.getAllSetPermissions(reference);
             NodeRef nodeToAdhereTo = establishPermisisonAdherence(reference);
             Set<AccessPermission> mergedEntries = new HashSet<>(virtualSetPermissions);
@@ -357,14 +358,14 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public Set<AccessPermission> getAllSetPermissions(NodeRef nodeRef)
     {
-        PermissionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        PermissionServiceTrait theTrait = getTrait();
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.getAllSetPermissions(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             Set<AccessPermission> virtualSetPermissions = smartStore.getAllSetPermissions(reference);
             NodeRef nodeToAdhereTo = establishPermisisonAdherence(reference);
             Set<AccessPermission> actualSetPermissions;
@@ -399,7 +400,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public Set<String> getSettablePermissions(NodeRef nodeRef)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             return getTrait().getSettablePermissions(nodeRef);
         }
@@ -444,7 +445,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void deletePermissions(NodeRef nodeRef)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             getTrait().deletePermissions(nodeRef);
         }
@@ -457,7 +458,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void clearPermission(NodeRef nodeRef, String authority)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             getTrait().clearPermission(nodeRef,
                                        authority);
@@ -471,7 +472,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void deletePermission(NodeRef nodeRef, String authority, String permission)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             getTrait().deletePermission(nodeRef,
                                         authority,
@@ -486,7 +487,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void setPermission(NodeRef nodeRef, String authority, String permission, boolean allow)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             getTrait().setPermission(nodeRef,
                                      authority,
@@ -502,7 +503,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public void setInheritParentPermissions(NodeRef nodeRef, boolean inheritParentPermissions)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             getTrait().setInheritParentPermissions(nodeRef,
                                                    inheritParentPermissions);
@@ -517,7 +518,7 @@ public class VirtualPermissionServiceExtension extends
     @Override
     public boolean getInheritParentPermissions(NodeRef nodeRef)
     {
-        if (!Reference.isReference(nodeRef))
+        if (Reference.fromNodeRef(nodeRef) == null)
         {
             return getTrait().getInheritParentPermissions(nodeRef);
         }
diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
index 7688310ca7..43668c443a 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtension.java
@@ -148,13 +148,13 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public boolean isAVersion(NodeRef nodeRef)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.isAVersion(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             return theTrait.isAVersion(materialNode);
         }
@@ -164,13 +164,13 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public boolean isVersioned(NodeRef nodeRef)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.isVersioned(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             return theTrait.isVersioned(materialNode);
         }
@@ -182,10 +182,9 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
         StoreRef frozenStoreRef = frozenStateNodeRef.getStoreRef();
 
         NodeRef materialFrozenNodeRef = frozenStateNodeRef;
-
-        if (Reference.isReference(frozenStateNodeRef))
+        Reference frozenReference = Reference.fromNodeRef(frozenStateNodeRef);
+        if (frozenReference != null)
         {
-            Reference frozenReference = Reference.fromNodeRef(frozenStateNodeRef);
             materialFrozenNodeRef = smartStore.materialize(frozenReference);
         }
 
@@ -197,10 +196,9 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
             // V2 version store (eg. workspace://version2Store)
             NodeRef propFrozenNode = (NodeRef) virtualProperties.get(Version2Model.PROP_FROZEN_NODE_REF);
             NodeRef propActualFrozenNode = propFrozenNode;
-
-            if (Reference.isReference(propFrozenNode))
+            Reference propFrozenReference = Reference.fromNodeRef(propFrozenNode);
+            if (propFrozenReference != null)
             {
-                Reference propFrozenReference = Reference.fromNodeRef(propFrozenNode);
                 propActualFrozenNode = smartStore.materialize(propFrozenReference);
             }
 
@@ -221,10 +219,9 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
                                                  frozenNodeStoreId,
                                                  frozenNodeId);
             NodeRef propActualFrozenNode = propFrozenNode;
-
-            if (Reference.isReference(propFrozenNode))
+            Reference propFrozenReference = Reference.fromNodeRef(propFrozenNode);
+            if (propFrozenReference != null)
             {
-                Reference propFrozenReference = Reference.fromNodeRef(propFrozenNode);
                 propActualFrozenNode = smartStore.materialize(propFrozenReference);
             }
             StoreRef propActualStoreRef = propFrozenNode.getStoreRef();
@@ -318,7 +315,8 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
                 throws ReservedVersionNameException, AspectMissingException
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.createVersion(nodeRef,
                                           versionProperties);
@@ -327,8 +325,7 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
         {
             NodeRef materialNode = smartStore.materializeIfPossible(nodeRef);
             Version actualVersion = theTrait.createVersion(materialNode,
-                                                           versionProperties);
-            Reference reference = Reference.fromNodeRef(nodeRef);
+                                                           versionProperties);    
             return virtualizeVersion(reference,
                                      actualVersion);
         }
@@ -339,7 +336,8 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
                 boolean versionChildren) throws ReservedVersionNameException, AspectMissingException
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.createVersion(nodeRef,
                                           versionProperties,
@@ -352,7 +350,6 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
                                                                         versionProperties,
                                                                         versionChildren);
 
-            Reference reference = Reference.fromNodeRef(nodeRef);
             return virtualizeVersions(reference,
                                       actualVersions);
         }
@@ -367,7 +364,8 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
         Map<NodeRef, Reference> materializedNodeRefs = new HashMap<>();
         for (NodeRef nodeRef : nodeRefs)
         {
-            if (!Reference.isReference(nodeRef))
+        	Reference reference = Reference.fromNodeRef(nodeRef);
+            if (reference == null)
             {
                 materialNodeRefs.add(nodeRef);
             }
@@ -376,7 +374,7 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
                 NodeRef materialNode = smartStore.materializeIfPossible(nodeRef);
                 materialNodeRefs.add(materialNode);
                 materializedNodeRefs.put(materialNode,
-                                         Reference.fromNodeRef(nodeRef));
+                                         reference);
             }
         }
 
@@ -407,13 +405,13 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public VersionHistory getVersionHistory(NodeRef nodeRef) throws AspectMissingException
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.getVersionHistory(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             VersionHistory actualVersionHistory = theTrait.getVersionHistory(materialNode);
             if (actualVersionHistory == null)
@@ -434,13 +432,13 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public Version getCurrentVersion(NodeRef nodeRef)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.getCurrentVersion(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             Reference versionedReference = Reference.fromNodeRef(nodeRef);
             Version actualVersion = theTrait.getCurrentVersion(materialNode);
@@ -453,13 +451,13 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public void revert(NodeRef nodeRef)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             theTrait.revert(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             theTrait.revert(materialNode);
         }
@@ -469,14 +467,14 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public void revert(NodeRef nodeRef, boolean deep)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             theTrait.revert(nodeRef,
                             deep);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             theTrait.revert(materialNode,
                             deep);
@@ -488,14 +486,14 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     {
 
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             theTrait.revert(nodeRef,
                             version);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             Version actualVersion = VirtualVersionServiceExtension.this.materializeVersionIfReference(version);
             theTrait.revert(materialNode,
@@ -507,15 +505,15 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public void revert(NodeRef nodeRef, Version version, boolean deep)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             theTrait.revert(nodeRef,
                             version,
                             deep);
         }
         else
-        {
-            Reference reference = Reference.fromNodeRef(nodeRef);
+        {         
             NodeRef materialNode = smartStore.materialize(reference);
             Version actualVersion = VirtualVersionServiceExtension.this.materializeVersionIfReference(version);
             theTrait.revert(materialNode,
@@ -528,7 +526,8 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public NodeRef restore(NodeRef nodeRef, NodeRef parentNodeRef, QName assocTypeQName, QName assocQName)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.restore(nodeRef,
                                     parentNodeRef,
@@ -537,7 +536,6 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             return theTrait.restore(materialNode,
                                     parentNodeRef,
@@ -550,7 +548,8 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public NodeRef restore(NodeRef nodeRef, NodeRef parentNodeRef, QName assocTypeQName, QName assocQName, boolean deep)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             return theTrait.restore(nodeRef,
                                     parentNodeRef,
@@ -560,7 +559,6 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             return theTrait.restore(materialNode,
                                     parentNodeRef,
@@ -574,13 +572,13 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public void deleteVersionHistory(NodeRef nodeRef) throws AspectMissingException
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             theTrait.deleteVersionHistory(nodeRef);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             theTrait.deleteVersionHistory(materialNode);
         }
@@ -590,14 +588,14 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public void deleteVersion(NodeRef nodeRef, Version version)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference == null)
         {
             theTrait.deleteVersion(nodeRef,
                                    version);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
             NodeRef materialNode = smartStore.materialize(reference);
             Version actualVersion = materializeVersionIfReference(version);
             theTrait.deleteVersion(materialNode,
@@ -609,14 +607,15 @@ public class VirtualVersionServiceExtension extends SpringBeanExtension<VersionS
     public void ensureVersioningEnabled(NodeRef nodeRef, Map<QName, Serializable> versionProperties)
     {
         VersionServiceTrait theTrait = getTrait();
-        if (!Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference ==  null)
         {
             theTrait.ensureVersioningEnabled(nodeRef,
                                              versionProperties);
         }
         else
         {
-            Reference reference = Reference.fromNodeRef(nodeRef);
+
             NodeRef materialNode = smartStore.materialize(reference);
             theTrait.ensureVersioningEnabled(materialNode,
                                              versionProperties);
diff --git a/source/java/org/alfresco/repo/virtual/ref/Reference.java b/source/java/org/alfresco/repo/virtual/ref/Reference.java
index d36f4687a2..ae40964e1e 100644
--- a/source/java/org/alfresco/repo/virtual/ref/Reference.java
+++ b/source/java/org/alfresco/repo/virtual/ref/Reference.java
@@ -63,7 +63,7 @@ public class Reference
      * NodeRef Reference representations validated by this method should produce
      * valid Reference objects based on the given {@link NodeRef} when passed to
      * the {@link #fromNodeRef(NodeRef)} method.
-     * 
+     * @deprecated 
      * @param nodeRef
      * @return <code>true</code> if the given {@link NodeRef} is a valid
      *         Reference representation<br>
@@ -119,55 +119,50 @@ public class Reference
     }
 
     /**
-     * {@link NodeRef} {@link Reference} representation decoder/converter
-     * method.<br>
-     * Creates a {@link Reference} representation based on the ID of the given
-     * {@link NodeRef}.<br>
-     * It expects a {@link #VIRTUAL_TOKEN} prefixed encoded string. The encoded
-     * string must start with a valid {@link Encoding} token. The Reference
-     * representation structure is (no delimiters between the 3 elements):
-     * VIRTUAL_TOKEN ENCODING_TOKEN referenceString Given that a valid encoding
-     * was detected {@link Encoding#urlNative} information is used to obtain a
-     * reference string. The reference string is parsed using the encoding
-     * configured parser.
-     * 
-     * @param nodeRef
-     * @return the {@link Reference} object corresponding to the given
-     *         {@link NodeRef}
-     * @throws ReferenceParseException
-     *             if an error occurs during the reference string parsing
-     * @throws ReferenceEncodingException
-     *             if the {@link NodeRef} ID has an invalid virtual token prefix
-     *             or it uses an invalid encoding token
-     */
-    public static final Reference fromNodeRef(NodeRef nodeRef) throws ReferenceParseException, ReferenceEncodingException
-    {
-        String id = nodeRef.getId();
-        if (id.startsWith("" + VIRTUAL_TOKEN) && (id.length() > 1)) // belts-and-braces
-        {
-            char token = id.charAt(1);
-            Encoding encoding = Encodings.fromToken(token);
-            if (encoding == null)
-            {
-                throw new ReferenceEncodingException("Invalid encoding token " + token + " in " + id);
-            }
-            else
-            {
-                String referenceString = id.substring(2);
-                if (!encoding.urlNative)
-                {
-                    referenceString = new String(org.apache.commons.codec.binary.Base64.decodeBase64(referenceString));
-                }
-
-                Reference reference = encoding.parser.parse(referenceString);
-                return reference.propagateNodeRefMutations(nodeRef);
-            }
-        }
-        else
-        {
-            throw new ReferenceEncodingException("Invalid node ID format " + id);
-        }
-    }
+	 * 
+	 * {@link NodeRef} {@link Reference} representation decoder/converter
+	 * method.<br>
+	 * Creates a {@link Reference} representation based on the ID of the given
+	 * {@link NodeRef}.<br>
+	 * It expects a {@link #VIRTUAL_TOKEN} prefixed encoded string. The encoded
+	 * string must start with a valid {@link Encoding} token. The Reference
+	 * representation structure is (no delimiters between the 3 elements):
+	 * VIRTUAL_TOKEN ENCODING_TOKEN referenceString Given that a valid encoding
+	 * was detected {@link Encoding#urlNative} information is used to obtain a
+	 * reference string. The reference string is parsed using the encoding
+	 * configured parser.
+	 * @param nodeRef
+	 * @return the {@link Reference} object corresponding to the given
+	 *         {@link NodeRef}
+	 *
+	 */
+	public static final Reference fromNodeRef(NodeRef nodeRef) {
+		String id = nodeRef.getId();
+		if (id.startsWith("" + VIRTUAL_TOKEN) && (id.length() > 1)) // belts-and-braces
+		{
+			char token = id.charAt(1);
+			Encoding encoding = Encodings.fromToken(token);
+			if (encoding != null) {
+				try {
+					String referenceString = id.substring(2);
+					if (!encoding.urlNative) {
+						referenceString = new String(
+								org.apache.commons.codec.binary.Base64.decodeBase64(referenceString));
+					}
+					Reference reference = encoding.parser.parse(referenceString);
+					return reference.propagateNodeRefMutations(nodeRef);
+				} catch (ReferenceParseException rpe) {
+					logger.debug("Parse exception:", rpe);
+					return null;
+				}catch (ReferenceEncodingException ree) {
+					logger.debug("encoding exception:", ree) ;
+					return null;
+				}
+				
+			}
+		}
+		return null;
+	}
 
     // Average reference length log trace
 
diff --git a/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java b/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
index c4346da8f0..e0c28dfb40 100644
--- a/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
+++ b/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
@@ -122,7 +122,8 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
     @Override
     public boolean isVirtual(NodeRef nodeRef) throws VirtualizationException
     {
-        if (Reference.isReference(nodeRef))
+    	Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference != null)
         {
             Protocol protocol = Reference.fromNodeRef(nodeRef).getProtocol();
             return Protocols.VIRTUAL.protocol.equals(protocol) || Protocols.VANILLA.protocol.equals(protocol);
@@ -150,7 +151,8 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
             return false;
         }
 
-        if (Reference.isReference(nodeRef))
+        Reference reference = Reference.fromNodeRef(nodeRef);
+        if (reference != null)
         {
             return true;
         }
@@ -189,9 +191,10 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
                 ReferenceEncodingException
     {
         NodeRef theNodeRef = nodeRef;
-        if (Reference.isReference(nodeRef))
+        Reference ref = Reference.fromNodeRef(theNodeRef);
+        if (ref != null)
         {
-            Reference ref = Reference.fromNodeRef(theNodeRef);
+           
             if (Protocols.NODE.protocol.equals(ref.getProtocol()))
             {
                 theNodeRef = ref.execute(new GetActualNodeRefMethod(environment));
@@ -225,14 +228,12 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
 
             if (reference == null)
             {
-                if (Reference.isReference(nodeRef))
+            	reference = Reference.fromNodeRef(nodeRef);
+                if (reference == null)
                 {
-                    reference = Reference.fromNodeRef(nodeRef);
-                }
-                else
-                {
-                    throw new VirtualizationException("No virtualization method for " + nodeRef);
+                	 throw new VirtualizationException("No virtualization method for " + nodeRef);
                 }
+               
             }
 
         }
@@ -261,9 +262,9 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
     @Override
     public NodeRef materializeIfPossible(NodeRef nodeRef) throws VirtualizationException
     {
-        if (Reference.isReference(nodeRef))
+    	Reference ref = Reference.fromNodeRef(nodeRef);
+        if (ref != null)
         {
-            Reference ref = Reference.fromNodeRef(nodeRef);
             if (canMaterialize(ref))
             {
                 return materialize(ref);
diff --git a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
index 8beffc454d..f3165590c1 100644
--- a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
@@ -310,7 +310,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
 
     protected void assertVirtualNode(NodeRef nodeRef, Map<QName, Serializable> expectedProperties)
     {
-        assertTrue(Reference.isReference(nodeRef));
+        assertNotNull(Reference.fromNodeRef(nodeRef));
 
         assertTrue(nodeService.hasAspect(nodeRef,
                                          VirtualContentModel.ASPECT_VIRTUAL));
diff --git a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
index ad7a7b6668..237b1190d4 100644
--- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
@@ -150,9 +150,10 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
                                                           "Node2_1");
         ChildAssociationRef childAssocRef = createContent(assocNode2_1,
                                                           "Content");
-        NodeRef node = childAssocRef.getChildRef();
-        assertTrue(Reference.isReference(node));
-        assertTrue(Reference.fromNodeRef(node).getProtocol().equals(Protocols.NODE.protocol));
+        NodeRef node = childAssocRef.getChildRef();
+        Reference reference = Reference.fromNodeRef(node);
+        assertNotNull(reference);
+        assertTrue(reference.getProtocol().equals(Protocols.NODE.protocol));
         
         QName nodeTypeQName = ContentModel.TYPE_THUMBNAIL;
         QName assocQName = QName.createQName("cm", "contentThumbnail", environment.getNamespacePrefixResolver());
@@ -369,9 +370,10 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
      * @param childAssocsRef
      */
     private void assertNewVirtualChildAssocRef(NodeRef nodeRef, ChildAssociationRef childAssocsRef)
-    {
-        assertTrue(Reference.isReference(nodeRef));
-        assertNewVirtualChildAssocRef(Reference.fromNodeRef(nodeRef),
+    {
+    	Reference reference = Reference.fromNodeRef(nodeRef);
+    	assertNotNull(reference);
+        assertNewVirtualChildAssocRef(reference,
                                       childAssocsRef);
     }
 
@@ -387,14 +389,13 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
         assertNotNull(childAssocsRef);
         NodeRef childNodeRef = childAssocsRef.getChildRef();
         NodeRef parentNodeRef = childAssocsRef.getParentRef();
+        Reference parentNodeRefV = Reference.fromNodeRef(parentNodeRef);
+        
+        assertNotNull(parentNodeRefV);
+        assertEquals(reference,parentNodeRefV);
 
-        assertTrue(Reference.isReference(parentNodeRef));
-        assertEquals(reference,
-                     Reference.fromNodeRef(parentNodeRef));
-
-        assertTrue(Reference.isReference(childNodeRef));
-        Reference.fromNodeRef(childNodeRef);
-        Reference childReference = Reference.fromNodeRef(childNodeRef);
+        Reference childReference = Reference.fromNodeRef(childNodeRef);
+        assertNotNull(childReference);
         Reference parent = childReference.execute(new GetParentReferenceMethod());
         assertEquals(reference,
                      parent);
@@ -527,9 +528,10 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
     private ChildAssociationRef findActualAssocPeer(ChildAssociationRef virtualAssoc, NodeRef actualParentNodeRef)
     {
         List<ChildAssociationRef> actualAssocs = nodeService.getChildAssocs(actualParentNodeRef);
-        NodeRef virtualChildNodeRef = virtualAssoc.getChildRef();
-        assertTrue(Reference.isReference(virtualChildNodeRef));
-        NodeRef materialNodeRef = smartStore.materialize(Reference.fromNodeRef(virtualChildNodeRef));
+        NodeRef virtualChildNodeRef = virtualAssoc.getChildRef();
+        Reference vChildNodeRef = Reference.fromNodeRef(virtualChildNodeRef);
+        assertNotNull(vChildNodeRef);
+        NodeRef materialNodeRef = smartStore.materialize(vChildNodeRef);
 
         for (ChildAssociationRef actualAssocRef : actualAssocs)
         {
diff --git a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java
index 697fe64363..e55e0054b2 100644
--- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java
@@ -107,8 +107,9 @@ public class VirtualRatingServiceExtensionTest extends VirtualizationIntegration
     @Test
     public void testApplyRatings() throws Exception
     {
-        assertTrue(Reference.isReference(virtualContent));
-        NodeRef actualNodeRef = Reference.fromNodeRef(virtualContent).execute(new GetActualNodeRefMethod(environment));
+    	Reference reference = Reference.fromNodeRef(virtualContent);
+        assertNotNull(reference);
+        NodeRef actualNodeRef = reference.execute(new GetActualNodeRefMethod(environment));
 
         applyRatingAs(virtualContent,
                       1f,
diff --git a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java
index e760d41579..6546db33bc 100644
--- a/source/test-java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/bundle/VirtualVersionServiceExtensionTest.java
@@ -107,10 +107,10 @@ public class VirtualVersionServiceExtensionTest extends VirtualizationIntegratio
         ChildAssociationRef contentWithVersionsAssocRef = createContent(node2_1,
                                                                         "ContentWithVersions");
         NodeRef contentWithVersionsNodeRef = contentWithVersionsAssocRef.getChildRef();
-        assertTrue(Reference.isReference(contentWithVersionsNodeRef));
-        NodeRef actualContentWithVersionsNodeRef = Reference
-                    .fromNodeRef(contentWithVersionsNodeRef)
-                        .execute(new GetActualNodeRefMethod(environment));
+        Reference reference = Reference.fromNodeRef(contentWithVersionsNodeRef);
+        assertNotNull(reference);
+        NodeRef actualContentWithVersionsNodeRef = 
+                        reference.execute(new GetActualNodeRefMethod(environment));
 
         VersionHistory versionHistory = versionService.getVersionHistory(contentWithVersionsNodeRef);
         assertNull(versionHistory);
@@ -121,7 +121,7 @@ public class VirtualVersionServiceExtensionTest extends VirtualizationIntegratio
                                                           null);
 
         NodeRef newVersionNodeRef = newVersion.getVersionedNodeRef();
-        assertTrue(Reference.isReference(newVersionNodeRef));
+        assertNotNull(Reference.fromNodeRef(newVersionNodeRef));
 
         versionHistory = versionService.getVersionHistory(newVersionNodeRef);
         assertNotNull(versionHistory);
@@ -140,7 +140,7 @@ public class VirtualVersionServiceExtensionTest extends VirtualizationIntegratio
         Version actualVersion = actualVersionHistory.getHeadVersion();
 
         NodeRef newActualVersionNodeRef = actualVersion.getVersionedNodeRef();
-        assertTrue(!Reference.isReference(newActualVersionNodeRef));
+        assertNull(Reference.fromNodeRef(newActualVersionNodeRef));
 
         assertEquals(newActualVersionNodeRef,
                      actualContentWithVersionsNodeRef);
diff --git a/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java b/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
index 5b1517a67a..015e3247e6 100644
--- a/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/store/VirtualStoreImplTest.java
@@ -165,7 +165,8 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
         // note: see Reference.VIRTUAL_TOKEN
         String v = "v";
 
-        assertFalse(Reference.isReference(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, v)));
+        Reference reference = Reference.fromNodeRef(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, v));
+        assertNull(reference);
         
         ChildAssociationRef folderChild = createFolder(companyHomeNodeRef, v);
         assertNotNull(folderChild);
@@ -265,7 +266,8 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
 
         assertTrue(smartStore.canVirtualize(virtualFolder));
         virtualFolder = smartStore.virtualize(virtualFolder).toNodeRef();
-        assertTrue(Reference.isReference(virtualFolder));
+        Reference reference = Reference.fromNodeRef(virtualFolder);
+        assertNotNull(reference);
         assertTrue(nodeService.exists(virtualFolder));
     }
 
@@ -278,7 +280,8 @@ public class VirtualStoreImplTest extends VirtualizationIntegrationTest
         QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(nodeName));
         NodeRef nfileNodeRef = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, assocQName, ContentModel.TYPE_CONTENT, props).getChildRef();
 
-        assertFalse(Reference.isReference(nfileNodeRef));
+        Reference reference =  Reference.fromNodeRef(nfileNodeRef);
+        assertNull(reference);
         assertTrue(nodeService.exists(nfileNodeRef));
     }
 }