Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r311966039e3523fc031ef73008a13657f75f5426 -r468734d3c36d110b296183b7a96c77ebf7c382eb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 311966039e3523fc031ef73008a13657f75f5426)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 468734d3c36d110b296183b7a96c77ebf7c382eb)
@@ -249,8 +249,9 @@
 	}
 	//add random questions (actually replacing them with real ones)
 	AssessmentResult lastResult = service.getLastAssessmentResult(assessment.getUid(), user.getUserId());
-	Map<Long, AssessmentQuestionResult> questionToResultMap = lastResult.getQuestionResults().stream()
-		.collect(Collectors.toMap(q -> q.getQbToolQuestion().getUid(), q -> q));
+	Map<Long, AssessmentQuestionResult> questionToResultMap = lastResult == null ? null
+		: lastResult.getQuestionResults().stream()
+			.collect(Collectors.toMap(q -> q.getQbToolQuestion().getUid(), q -> q));
 	for (QuestionReference questionReference : questionReferences) {
 	    if (questionReference.isRandomQuestion()) {