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.124 -r1.125
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	11 Jul 2016 12:43:56 -0000	1.124
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	3 Feb 2017 10:47:03 -0000	1.125
@@ -597,8 +597,14 @@
 	    }
 	} else {
 	    // update workspace/folder names
-	    organisation.getNormalFolder().setName(organisation.getName());
-	    organisation.getRunSequencesFolder().setName(getRunSequencesFolderName(organisation.getName()));
+	    WorkspaceFolder workspaceFolder = organisation.getNormalFolder();
+	    if (workspaceFolder != null) {
+		workspaceFolder.setName(organisation.getName());
+	    }
+	    WorkspaceFolder runSequencesFolder = organisation.getRunSequencesFolder();
+	    if (runSequencesFolder != null) {
+		runSequencesFolder.setName(getRunSequencesFolderName(organisation.getName()));
+	    }
 	}
 
 	return organisation;