diff --git a/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java b/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java
index e5b3d11bd17963ae07a9f5d56a5d3d93c7c89cae..476d3e29682421e27335816d65600100ca849530 100644
--- a/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java
+++ b/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java
@@ -426,14 +426,14 @@ public class ICalFileCalendarManager implements CalendarManager, InitializingBea
 		String token = RandomStringUtils.randomAlphanumeric(6);
 		Kalendar calendar = new Kalendar(identity.getKey().toString(), CalendarManager.TYPE_USER_AGGREGATED);
 		return calendarUserConfigDao.createCalendarUserConfiguration(calendar, identity,
-				token, false, false);
+				token, true, true);
 	}
 
 	@Override
 	public CalendarUserConfiguration createCalendarConfig(Identity identity, Kalendar calendar) {
 		String token = RandomStringUtils.randomAlphanumeric(6);
 		return calendarUserConfigDao.createCalendarUserConfiguration(calendar, identity,
-				token, false, false);
+				token, true, true);
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index b46cea2ceeb8a3e77d5ef347ef31e51dcfbbbd45..122deab3386824d5294b9cc943b7994e5b03191a 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -668,7 +668,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
 		File fUnzippedDirRoot = frm.unzipFileResource(testEntry.getOlatResource());
 		ResolvedAssessmentTest resolvedAssessmentTest = qtiService.loadAndResolveAssessmentTest(fUnzippedDirRoot, false, false);
 		AssessmentTest assessmentTest = resolvedAssessmentTest.getRootNodeLookup().extractIfSuccessful();
-		if(assessmentTest.getTimeLimits() != null && assessmentTest.getTimeLimits().getMaximum() != null) {
+		if(assessmentTest != null && assessmentTest.getTimeLimits() != null && assessmentTest.getTimeLimits().getMaximum() != null) {
 			return assessmentTest.getTimeLimits().getMaximum().longValue();
 		}
 		return null;