diff --git a/src/main/java/org/olat/NewControllerFactory.java b/src/main/java/org/olat/NewControllerFactory.java
index 9a2960af31b21a8372fec375bdef115ac048e90f..2e3bca280f0d047599c69337d0afa036666f9e44 100644
--- a/src/main/java/org/olat/NewControllerFactory.java
+++ b/src/main/java/org/olat/NewControllerFactory.java
@@ -140,7 +140,10 @@ public class NewControllerFactory extends LogDelegator {
 	
 	private ContextEntryControllerCreator getContextEntryControllerCreator(String type) {
 		ContextEntryControllerCreator typeHandler = contextEntryControllerCreators.get(type);
-		return typeHandler.clone();
+		if(typeHandler != null) {
+			return typeHandler.clone();
+		}
+		return null;
 	}
 
 	/**
diff --git a/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java b/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java
index 5e6becf4a2276875a5cc5c189f0de719eb06c5b3..a9a40a3ccda2e1aebf57413c2758047e9683d352 100644
--- a/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java
+++ b/src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java
@@ -104,7 +104,7 @@ public class ResumeController extends FormBasicController implements SupportsAft
 					//make the resume secure. If something fail, don't generate a red screen
 					NewControllerFactory.getInstance().launch(ureq, bwControl);
 				} catch (Exception e) {
-					logError("Error while resumging", e);
+					logError("Error while resuming", e);
 				}
 			}
 			return false;