Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.107.2.20 -r1.107.2.21
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	11 May 2016 07:07:59 -0000	1.107.2.20
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	20 Dec 2016 09:03:42 -0000	1.107.2.21
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java,v
diff -u -r1.53.2.21 -r1.53.2.22
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	8 Dec 2016 10:08:21 -0000	1.53.2.21
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java	20 Dec 2016 09:03:42 -0000	1.53.2.22
@@ -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();