Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -ra526efa07d1684c564c2d9c39833f869a263bb3b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision a526efa07d1684c564c2d9c39833f869a263bb3b) @@ -568,10 +568,12 @@ public AssessmentResult getUserMasterDetail(Long sessionId, Long userId) { AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResultBySessionId(sessionId, userId); - SortedSet questionResults = new TreeSet(new AssessmentQuestionResultComparator()); - questionResults.addAll(lastFinishedResult.getQuestionResults()); - lastFinishedResult.setQuestionResults(questionResults); - escapeQuotes(lastFinishedResult); + if (lastFinishedResult != null) { + SortedSet questionResults = new TreeSet(new AssessmentQuestionResultComparator()); + questionResults.addAll(lastFinishedResult.getQuestionResults()); + lastFinishedResult.setQuestionResults(questionResults); + escapeQuotes(lastFinishedResult); + } return lastFinishedResult; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== diff -u -rfaf1d8e70be87d6f9d13c26f129f5e739ce41484 -ra526efa07d1684c564c2d9c39833f869a263bb3b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision faf1d8e70be87d6f9d13c26f129f5e739ce41484) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision a526efa07d1684c564c2d9c39833f869a263bb3b) @@ -134,7 +134,7 @@ AssessmentResult result = service.getUserMasterDetail(sessionId, userId); request.setAttribute(AssessmentConstants.ATTR_ASSESSMENT_RESULT, result); - return mapping.findForward(AssessmentConstants.SUCCESS); + return (result == null) ? null : mapping.findForward(AssessmentConstants.SUCCESS); } private ActionForward questionSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request,