diff --git a/source/java/org/alfresco/repo/rule/RuleLinkTest.java b/source/java/org/alfresco/repo/rule/RuleLinkTest.java
index dee8924938..f7b9f66720 100644
--- a/source/java/org/alfresco/repo/rule/RuleLinkTest.java
+++ b/source/java/org/alfresco/repo/rule/RuleLinkTest.java
@@ -261,7 +261,7 @@ public class RuleLinkTest extends BaseSpringTest
     
     /**
      * ALF-11923
-     * @since Odin
+     * @since 4.0.2
      * @author Neil Mc Erlean.
      */
     public void testDeleteFolderWithRulesLinkedTo()
diff --git a/source/java/org/alfresco/repo/rule/RulesAspect.java b/source/java/org/alfresco/repo/rule/RulesAspect.java
index b32701168c..47eac6327c 100644
--- a/source/java/org/alfresco/repo/rule/RulesAspect.java
+++ b/source/java/org/alfresco/repo/rule/RulesAspect.java
@@ -132,7 +132,7 @@ public class RulesAspect implements
     }
     
     /**
-     * @since Odin
+     * @since 4.0.2
      * @author Neil Mc Erlean
      */
     @Override public void beforeDeleteNode(NodeRef nodeRef)
@@ -158,7 +158,10 @@ public class RulesAspect implements
                     // Remove the aspect that marks the other folder has having rules (linked ones)
                     nodeService.removeAspect(linkedFolder.getParentRef(), RuleModel.ASPECT_RULES);
                     // And remove the child-assoc to the rules folder.
-                    nodeService.removeSecondaryChildAssociation(linkedFolder);
+                    if (nodeService.exists(linkedFolder.getChildRef()))
+                    {
+                        nodeService.removeSecondaryChildAssociation(linkedFolder);
+                    }
                 }
             }
         }