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.15.2.1.2.1 -r1.15.2.1.2.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	22 Nov 2010 15:46:20 -0000	1.15.2.1.2.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	22 Nov 2010 15:59:18 -0000	1.15.2.1.2.2
@@ -570,10 +570,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/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.14.6.1 -r1.14.6.2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	25 Feb 2010 23:47:12 -0000	1.14.6.1
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	22 Nov 2010 15:59:18 -0000	1.14.6.2
@@ -549,6 +549,7 @@
 		}
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ESSAY) {
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
+		answerString = answerString.replaceAll("[\n\r\f]", "");
 		question.setAnswerString(answerString);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    }