diff --git a/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java b/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java
index 3aee7827be5552cb03700691d1bcc7601b7a8c88..e1d4259dc62ea8bbef5724f43b8f154c12bd72a9 100644
--- a/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java
+++ b/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java
@@ -312,6 +312,8 @@ public class VideoMarkerEditController extends BasicController {
 			if(currentTimeCode != null) {
 				long time = Math.round(Double.parseDouble(currentTimeCode)) * 1000l;
 				newMarker.setBegin(new Date(time));
+			} else {
+				newMarker.setBegin(new Date(0l));
 			}
 			
 			markers.getMarkers().add(newMarker);
@@ -341,7 +343,7 @@ public class VideoMarkerEditController extends BasicController {
 		private void doDeleteMarker(VideoMarker marker) {
 			markers.getMarkers().remove(marker);
 			videoManager.saveMarkers(markers, entry.getOlatResource());
-			if(markerEditCtrl != null && markerEditCtrl.getMarker().equals(marker)) {
+			if(markerEditCtrl != null && markerEditCtrl.getMarker() != null && markerEditCtrl.getMarker().equals(marker)) {
 				markerEditCtrl.getInitialComponent().setVisible(false);
 			}
 			loadModel(true, markers.getMarkers());