Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150 -r8ea95533d6736667cdc87380ac9067a2617ab1f3
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 8ea95533d6736667cdc87380ac9067a2617ab1f3)
@@ -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);