Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r144d391c51436459564a6346c241174506eca988
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 144d391c51436459564a6346c241174506eca988)
@@ -1809,7 +1809,7 @@
 		log.warn("When getting recent access list for Author with ID " + userId + " LD with ID "
 			+ access.getLearningDesignId() + " was found missing. Deleting access entry.");
 		baseDAO.delete(access);
-	    } else {
+	    } else if (learningDesign.getWorkspaceFolder() != null) {
 		access.setTitle(learningDesign.getTitle());
 		access.setWorkspaceFolderId(learningDesign.getWorkspaceFolder().getWorkspaceFolderId());
 		result.add(access);
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
===================================================================
diff -u -r2f02ea654f2380229d55ffd2483ba21ac48856d8 -r144d391c51436459564a6346c241174506eca988
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2f02ea654f2380229d55ffd2483ba21ac48856d8)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 144d391c51436459564a6346c241174506eca988)
@@ -186,8 +186,10 @@
 	}
 
 	Integer userId = getUserId();
-	getAuthoringService().storeLearningDesignAccess(learningDesignID, userId);
-
+	if (learningDesignDTO.getWorkspaceFolderID() != null) {
+	    getAuthoringService().storeLearningDesignAccess(learningDesignID, userId);
+	}
+	
 	response.setContentType("application/json;charset=utf-8");
 	JSONObject responseJSON = new JSONObject();
 	Gson gson = new GsonBuilder().create();