diff --git a/src/de/t_battermann/dhbw/todolist/Controller.java b/src/de/t_battermann/dhbw/todolist/Controller.java
index 70f9c22..c55751c 100644
--- a/src/de/t_battermann/dhbw/todolist/Controller.java
+++ b/src/de/t_battermann/dhbw/todolist/Controller.java
@@ -581,6 +581,10 @@ public class Controller {
 				ErrorPrinter.printWarning("saveTodoEntry > Didn’t find element #todoDetailDate!");
 				return;
 			}
+			if ( dd == null ) {
+				this.updateStatusLine("Invalid date!");
+				return;
+			}
 			if (!this.currentTodo.validateTime(((TextField) n).getText())) {
 				this.updateStatusLine("Invalid time format, use HH:MM!");
 				return;