diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java
index 637dceaaf8b02b1b3a80844056a1d3793d868449..6f887f7b8e790ace23664afd2d173c30c0c8f85f 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/OrganismController.java
@@ -253,20 +253,23 @@ public class OrganismController extends HttpServlet {
                     SessionControllerGetter.getOrganismBean().storeOrganismCropCategories(user.getOrganizationId().getOrganizationId(), organism, cropCategoryIds);
                     
                     //System.out.println(formValidation.getFormFields().toString());
-                    Map<String, FormField> externalResourceIdentifiers = formValidation.getMultipleMapFormFields().get("externalResourceIdentifier");
-                    for(String key:externalResourceIdentifiers.keySet())
+                    if(formValidation.getMultipleMapFormFields().get("externalResourceIdentifier") != null)
                     {
-                        FormField identifierField = externalResourceIdentifiers.get(key);
-                        if(identifierField.getWebValue() == null || identifierField.getWebValue().isEmpty())
+                        Map<String, FormField> externalResourceIdentifiers = formValidation.getMultipleMapFormFields().get("externalResourceIdentifier");
+                        for(String key:externalResourceIdentifiers.keySet())
                         {
-                            continue;
+                            FormField identifierField = externalResourceIdentifiers.get(key);
+                            if(identifierField.getWebValue() == null || identifierField.getWebValue().isEmpty())
+                            {
+                                continue;
+                            }
+                            Integer externalResourceId = Integer.valueOf(key);
+                            OrganismExternalResource organismExternalResource = new OrganismExternalResource();
+                            OrganismExternalResourcePK pk = new OrganismExternalResourcePK(organism.getOrganismId(), externalResourceId);
+                            organismExternalResource.setOrganismExternalResourcePK(pk);
+                            organismExternalResource.setResourceIdentifier(identifierField.getWebValue());
+                            SessionControllerGetter.getOrganismBean().storeOrganismExternalResource(organismExternalResource);
                         }
-                        Integer externalResourceId = Integer.valueOf(key);
-                        OrganismExternalResource organismExternalResource = new OrganismExternalResource();
-                        OrganismExternalResourcePK pk = new OrganismExternalResourcePK(organism.getOrganismId(), externalResourceId);
-                        organismExternalResource.setOrganismExternalResourcePK(pk);
-                        organismExternalResource.setResourceIdentifier(identifierField.getWebValue());
-                        SessionControllerGetter.getOrganismBean().storeOrganismExternalResource(organismExternalResource);
                     }
                     // Need to refresh organism after storing the external resources
                     Organism refreshedOrganism = em.find(Organism.class, organism.getOrganismId());