Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r175dc482810f66792d9550d8cf511b29b0c6b06a -r7828086c1601ca9e307e9c1758a2be3fe7773943
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 175dc482810f66792d9550d8cf511b29b0c6b06a)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 7828086c1601ca9e307e9c1758a2be3fe7773943)
@@ -1464,10 +1464,12 @@
 	baseDAO.insertOrUpdateAll(allCompetenceMappings);
 
 	// Process annotations (regions and labels)
-	for (LearningDesignAnnotation annotation : dto.getAnnotations()) {
-	    annotation.setUid(null);
-	    annotation.setLearningDesignId(ld.getLearningDesignId());
-	    baseDAO.insert(annotation);
+	if (dto.getAnnotations() != null) {
+	    for (LearningDesignAnnotation annotation : dto.getAnnotations()) {
+		annotation.setUid(null);
+		annotation.setLearningDesignId(ld.getLearningDesignId());
+		baseDAO.insert(annotation);
+	    }
 	}
 
 	return ld.getLearningDesignId();
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -rbe74862925361d836bef1df4c5959105c9695a87 -r7828086c1601ca9e307e9c1758a2be3fe7773943
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision be74862925361d836bef1df4c5959105c9695a87)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 7828086c1601ca9e307e9c1758a2be3fe7773943)
@@ -602,9 +602,11 @@
 
     @Override
     public void disableUser(Integer userId) {
-
 	User user = (User) findById(User.class, userId);
 	user.setDisabledFlag(true);
+	log.debug("disabling user " + user.getLogin());
+	saveUser(user);
+
 	Set uos = user.getUserOrganisations();
 	Iterator iter = uos.iterator();
 	while (iter.hasNext()) {
@@ -613,8 +615,6 @@
 	    delete(uo);
 	    iter.remove();
 	}
-	log.debug("disabling user " + user.getLogin());
-	saveUser(user);
     }
 
     @Override
@@ -1072,7 +1072,7 @@
 	    throw new IOException("/tmp/portraits is not readable");
 	}
 
-	List<String> uploadedPortraits = new LinkedList<String>();
+	List<String> uploadedPortraits = new LinkedList<>();
 	Integer prefixLength = StringUtils.isBlank(prefix) ? null : prefix.length() + 1;
 
 	for (int userId = minUserId; userId <= maxUserId; userId++) {