diff --git a/source/java/org/alfresco/repo/importer/ImporterComponent.java b/source/java/org/alfresco/repo/importer/ImporterComponent.java
index 41db85b96f..7241cb61b9 100644
--- a/source/java/org/alfresco/repo/importer/ImporterComponent.java
+++ b/source/java/org/alfresco/repo/importer/ImporterComponent.java
@@ -1181,14 +1181,16 @@ public class ImporterComponent
 
                 // Create initial node (but, first disable behaviour for the node to be created)
                 Set<QName> disabledBehaviours = getDisabledBehaviours(node);
+                List<QName> alreadyDisabledBehaviours = new ArrayList<QName>(); 
                 for (QName disabledBehaviour: disabledBehaviours)
                 {
                     boolean alreadyDisabled = behaviourFilter.disableBehaviour(disabledBehaviour);
                     if (alreadyDisabled)
                     {
-                        disabledBehaviours.remove(disabledBehaviour);
+                        alreadyDisabledBehaviours.add(disabledBehaviour);
                     }
                 }
+                disabledBehaviours.removeAll(alreadyDisabledBehaviours);
                 
                 // Build initial map of properties
                 Map<QName, Serializable> initialProperties = bindProperties(node);
@@ -1276,7 +1278,6 @@ public class ImporterComponent
                         ChildAssociationRef childAssocRef = nodeService.getPrimaryParent(existingNodeRef);
                         
                         // TODO: Check for root node
-                        
                         nodeService.removeChild(childAssocRef.getParentRef(), childAssocRef.getChildRef());
                     }
                 }
diff --git a/source/java/org/alfresco/repo/importer/view/NodeContext.java b/source/java/org/alfresco/repo/importer/view/NodeContext.java
index 47fc09b041..3df16a381d 100644
--- a/source/java/org/alfresco/repo/importer/view/NodeContext.java
+++ b/source/java/org/alfresco/repo/importer/view/NodeContext.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessPermission;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 
 
@@ -340,6 +341,13 @@ public class NodeContext extends ElementContext
      */
     public void addAccessControlEntry(AccessStatus accessStatus, String authority, String permission)
     {
+       // Note: Map guest permission to Consumer permission - this is to handle the case where 
+       //       exports made against a pre 1.2 RC2 release
+       if (permission.equalsIgnoreCase("guest"))
+       {
+           permission = PermissionService.CONSUMER;
+       }
+      
        ACE ace = new ACE();
        ace.accessStatus = accessStatus;
        ace.authority = authority;