Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.18 -r1.19
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	26 Jul 2009 22:18:18 -0000	1.18
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	4 Aug 2009 16:35:01 -0000	1.19
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v
diff -u -r1.10 -r1.11
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	27 Jul 2009 04:20:30 -0000	1.10
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	4 Aug 2009 16:35:01 -0000	1.11
@@ -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,