diff --git a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
index 28d14c6ab48a3f24a660f7086df779b038b02eff..60930b7ffeb689258240ccdd1f85a3323b27be87 100644
--- a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
+++ b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
@@ -388,7 +388,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
 		
 		AssessmentEntry nodeAssessment = assessmentService
 				.loadAssessmentEntry(identity, cgm.getCourseEntry(), courseNode.getIdent());	
-		return nodeAssessment == null ? INTEGER_ZERO : nodeAssessment.getAttempts();
+		return nodeAssessment == null || nodeAssessment.getAttempts() == null  ? INTEGER_ZERO : nodeAssessment.getAttempts();
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/course/nodes/iq/IQRunController.java b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
index 989f4eedc62ecf32fabd7f427bde826e83b1ffa9..7823c0f44bebc74ae63650eb58a2b0994f1a7ded 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
@@ -610,7 +610,7 @@ public class IQRunController extends BasicController implements GenericEventList
 	    		myContent.contextPut("passed", assessmentEntry.getPassed());
 	    		StringBuilder comment = Formatter.stripTabsAndReturns(assessmentEntry.getComment());
 	    		myContent.contextPut("comment", StringHelper.xssScan(comment));
-	    		myContent.contextPut("attempts", assessmentEntry.getAttempts());
+	    		myContent.contextPut("attempts", assessmentEntry.getAttempts() == null ? 0 : assessmentEntry.getAttempts());
     		}
     	}