diff --git a/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html b/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html index d613e8fa0aad762cc7c390533a45d6c52518e805..d181271b76ab232b72b37509bd2e1d7d04498328 100644 --- a/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html +++ b/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html @@ -141,7 +141,7 @@ $r.render("highScore") #end -#if($showResultsOnHomePage && $attempts > 0) +#if($showResultsOnHomePage && $r.isNotNull($attempts) && $attempts > 0) <div class="panel panel-default o_results"> <div class="panel-heading"> <h4 class="panel-title">#if ($showResults && $r.available("command.hideResults")) diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java index 2eb6621cd5e36c5b73ac37063f5de310af8893b9..f3c255aa375f81737f1a4448d8361eef03d7742e 100644 --- a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java +++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java @@ -398,9 +398,11 @@ public class AssessmentTestDisplayController extends BasicController implements @Override protected void doDispose() { suspendAssessmentTest(new Date()); - OLATResourceable sessionOres = OresHelper - .createOLATResourceableInstance(AssessmentTestSession.class, candidateSession.getKey()); - CoordinatorManager.getInstance().getCoordinator().getEventBus().deregisterFor(this, sessionOres); + if(candidateSession != null) { + OLATResourceable sessionOres = OresHelper + .createOLATResourceableInstance(AssessmentTestSession.class, candidateSession.getKey()); + CoordinatorManager.getInstance().getCoordinator().getEventBus().deregisterFor(this, sessionOres); + } } /**