Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r96033f32ff880d045b4c087f52628d233dc98095 -r7feea405b05b8c29cca9cf7d81bbf652d7bd5314
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 96033f32ff880d045b4c087f52628d233dc98095)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 7feea405b05b8c29cca9cf7d81bbf652d7bd5314)
@@ -473,7 +473,7 @@
 	    throw new IOException("Learning Design not found, ID: " + learningDesignID);
 	}
 	// only the user who is editing the design may unlock it
-	if (design.getEditOverrideUser().equals(user)) {
+	if (design.getEditOverrideUser() == null || design.getEditOverrideUser().equals(user)) {
 	    design.setEditOverrideLock(false);
 	    design.setEditOverrideUser(null);