Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v
diff -u -r1.36.2.8 -r1.36.2.9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	29 Dec 2016 16:36:50 -0000	1.36.2.8
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	30 Dec 2016 06:26:55 -0000	1.36.2.9
@@ -392,7 +392,7 @@
 	// get back login user DTO
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	AssessmentUser assessmentUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
-		assessmentForm.getAssessment().getContentId());
+		assessmentPO.getContentId());
 	if (assessmentUser == null) {
 	    assessmentUser = new AssessmentUser(user, assessmentPO);
 	}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v
diff -u -r1.62.2.3 -r1.62.2.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	29 Dec 2016 16:36:47 -0000	1.62.2.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	30 Dec 2016 06:26:56 -0000	1.62.2.4
@@ -531,7 +531,7 @@
 
 	// **********************************Get Resource
 	// PO*********************
-	Resource resourcePO = service.getResourceByContentId(resourceForm.getResource().getContentId());
+	Resource resourcePO = service.getResourceByContentId(resource.getContentId());
 	if (resourcePO == null) {
 	    // new Resource, create it.
 	    resourcePO = resource;
@@ -566,7 +566,7 @@
 	// get back login user DTO
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	ResourceUser resourceUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
-		resourceForm.getResource().getContentId());
+		resourcePO.getContentId());
 	if (resourceUser == null) {
 	    resourceUser = new ResourceUser(user, resourcePO);
 	}