diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 32bd7ddd86..2115a712cf 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -430,7 +430,7 @@
          <groupId>org.springframework</groupId>
          <artifactId>spring-test</artifactId>
          <version>2.5</version>
-         <scope>provided</scope>
+         <scope>test</scope>
        </dependency>
        <dependency>
          <groupId>org.alfresco</groupId>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/BasePostMethodInvocationProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/BasePostMethodInvocationProcessor.java
index ceb2bc0ab0..c9fe37f231 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/BasePostMethodInvocationProcessor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/BasePostMethodInvocationProcessor.java
@@ -32,7 +32,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.util.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
 /**
  * Base class for post method invocation processors
@@ -40,7 +39,6 @@ import org.springframework.test.context.ContextConfiguration;
  * @author Tuna Aksoy
  * @since 3.0
  */
-@ContextConfiguration(locations = {"classpath:alfresco/module/org_alfresco_module_rm/classified-content-context.xml"})
 public abstract class BasePostMethodInvocationProcessor
 {
     /** Node service */
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ChildAssociationRefPostMethodInvocationProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ChildAssociationRefPostMethodInvocationProcessor.java
index 288610dcc8..b6d2b85786 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ChildAssociationRefPostMethodInvocationProcessor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ChildAssociationRefPostMethodInvocationProcessor.java
@@ -46,14 +46,25 @@ public class ChildAssociationRefPostMethodInvocationProcessor extends AbstractPo
     @Override
     protected <T> T processSingleElement(T object)
     {
+        T result;
+
         ChildAssociationRef childAssociationRef = getClassName().cast(object);
 
         NodeRef childRef = childAssociationRef.getChildRef();
         NodeRef filteredChildRef = filter(childRef);
 
         NodeRef parentRef = childAssociationRef.getParentRef();
-        NodeRef filteredParentRef = filter(parentRef);
+        NodeRef filteredParentRef;
+        if (parentRef == null)
+        {
+            result = filteredChildRef == null ? null : object;
+        }
+        else
+        {
+            filteredParentRef = filter(parentRef);
+            result = (filteredChildRef == null || filteredParentRef == null) ? null : object;
+        }
 
-        return (filteredChildRef == null || filteredParentRef == null) ? null : object;
+        return result;
     }
 }