diff --git a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
index dcc4d1d368766241093f9ac21c43c5d3eec81cca..b03c06209aa0e6590fd66bdf17177e64575dab57 100644
--- a/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
+++ b/uk/ac/sanger/artemis/chado/ChadoTransactionManager.java
@@ -1965,6 +1965,11 @@ public class ChadoTransactionManager
       {
         Hashtable mappingIds = feature.getNewIdMapToOldId();
         
+        if(mappingIds == null)
+        {
+          logger4j.debug("No mapping found.");
+          return;
+        }
         Object newKeys[] = segmentRangeStore.keySet().toArray();
         uniqueName = new String[newKeys.length];
         oldUniqueNames = new String[newKeys.length];