Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -re0dbb500c2a4fc98b9bfec440e4f07af39be5b19
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision e0dbb500c2a4fc98b9bfec440e4f07af39be5b19)
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -109,7 +110,7 @@
 	Set uos = organisation.getUserOrganisations();
 
 	String[] userIds = userOrgForm.getUserIds();
-	List<String> userIdList = Arrays.asList(userIds);
+	List<String> userIdList = userIds == null ? Collections.emptyList() : Arrays.asList(userIds);
 	log.debug("new user membership of orgId=" + orgId + " will be: " + userIdList);
 
 	// remove UserOrganisations that aren't in form data
@@ -129,7 +130,7 @@
 	    }
 	}
 	// add UserOrganisations that are in form data
-	List<UserOrganisation> newUserOrganisations = new ArrayList<UserOrganisation>();
+	List<UserOrganisation> newUserOrganisations = new ArrayList<>();
 	for (int i = 0; i < userIdList.size(); i++) {
 	    Integer userId = new Integer(userIdList.get(i));
 	    Iterator iter2 = uos.iterator();