Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -r1e8b7013cc4d8974464a07dcac60c750838c5dc6 -rb26d70cd134d5030a7baae04351d2ccc61862d6f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 1e8b7013cc4d8974464a07dcac60c750838c5dc6)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision b26d70cd134d5030a7baae04351d2ccc61862d6f)
@@ -172,7 +172,7 @@
 	for (AssessmentQuestion question : assessment.getQuestions()) {
 	    // since we are iterating anyway, here fill version information to each question
 	    qbService.fillVersionMap(question.getQbQuestion());
-	    
+
 	    if (question.isRandomQuestion()) {
 		randomPoolQuestions.add(question);
 	    }
@@ -829,7 +829,7 @@
 
 	// initial Overall feedbacks list
 	SortedSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<>(new SequencableComparator());
-	if (!assessment.getOverallFeedbacks().isEmpty()) {
+	if (assessment != null && !assessment.getOverallFeedbacks().isEmpty()) {
 	    overallFeedbackList.addAll(assessment.getOverallFeedbacks());
 	} else {
 	    for (int i = 1; i <= AssessmentConstants.INITIAL_OVERALL_FEEDBACK_NUMBER; i++) {