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.89 -r1.90
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	29 Feb 2008 05:15:23 -0000	1.89
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	29 Feb 2008 05:21:25 -0000	1.90
@@ -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;