diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMNodesImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMNodesImpl.java
index 81e839c120..e9b7f71de9 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMNodesImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMNodesImpl.java
@@ -138,7 +138,14 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
 
         if (type == null)
         {
-            node = new FileplanComponentNode(originalNode);
+            if (filePlanService.isFilePlanComponent(nodeRef))
+            {
+                node = new FileplanComponentNode(originalNode);
+            }
+            else
+            {
+                throw new InvalidParameterException("The provided node is not a fileplan component");
+            }
         }
         else
         {