Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r4725fa9e6b46a3c3985c14d65e12a7f510bd5494 -ra260d2b0a1690b192d6c83163e42b4212c587980
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 4725fa9e6b46a3c3985c14d65e12a7f510bd5494)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision a260d2b0a1690b192d6c83163e42b4212c587980)
@@ -528,11 +528,13 @@
             } else {
             	// update workspace/folder names
             	Workspace workspace = organisation.getWorkspace();
-            	workspace.setName(organisation.getName());
-            	WorkspaceFolder defaultFolder = workspace.getDefaultFolder();
-            	defaultFolder.setName(organisation.getName());
-            	WorkspaceFolder runSeqFolder = workspace.getDefaultRunSequencesFolder();
-            	runSeqFolder.setName(getRunSequencesFolderName(organisation.getName()));
+            	if (workspace != null) {
+            		workspace.setName(organisation.getName());
+            		WorkspaceFolder defaultFolder = workspace.getDefaultFolder();
+            		if (defaultFolder != null) defaultFolder.setName(organisation.getName());
+            		WorkspaceFolder runSeqFolder = workspace.getDefaultRunSequencesFolder();
+            		if (runSeqFolder != null) runSeqFolder.setName(getRunSequencesFolderName(organisation.getName()));
+            	}
             }
 
             return organisation;