Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rca1ba0e008423cc789ec596184bb0e38990fb441
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision ca1ba0e008423cc789ec596184bb0e38990fb441)
@@ -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;