Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r76258f97445382165e9fe2eca35f8738d69d5b67 -r37824727b8d7b0666506631e04b603678f4163d3
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 76258f97445382165e9fe2eca35f8738d69d5b67)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 37824727b8d7b0666506631e04b603678f4163d3)
@@ -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;