Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.115.2.14 -r1.115.2.15
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	11 May 2016 07:07:27 -0000	1.115.2.14
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	15 Jun 2016 08:00:00 -0000	1.115.2.15
@@ -434,8 +434,12 @@
 	    }
 	} else {
 	    // update workspace/folder names
-	    organisation.getNormalFolder().setName(organisation.getName());
-	    organisation.getRunSequencesFolder().setName(getRunSequencesFolderName(organisation.getName()));
+	    WorkspaceFolder folder = organisation.getNormalFolder();
+	    if ( folder != null )
+		folder.setName(organisation.getName());
+	    folder = organisation.getRunSequencesFolder();
+	    if ( folder != null )
+		folder.setName(getRunSequencesFolderName(organisation.getName()));
 	}
 
 	return organisation;