diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js
index 66818d71..89649c2c 100644
--- a/server/handlers/list_change.js
+++ b/server/handlers/list_change.js
@@ -12,10 +12,12 @@ function add_function(arr, coll, guid, offline, socket) {
             var start = parseInt(arr.start);
             var end = parseInt(arr.end);
             if(start < 0) {
-                start = 0;
+                socket.emit("toast", "faulty_start_end");
+                return;
             }
             if(end < 0) {
-                end = arr.duration;
+                socket.emit("toast", "faulty_start_end");
+                return;
             }
             if(start >= end) {
                 start = 0;
diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js
index 15f6c76e..fb9aa9fd 100755
--- a/server/public/assets/js/admin.js
+++ b/server/public/assets/js/admin.js
@@ -7,6 +7,9 @@ var Admin = {
             case "suggested_thumbnail":
                 msg = "The thumbnail has been suggested!";
                 break;
+            case "faulty_start_end":
+                msg = "You tried to send a faulty start/end value. Try again..";
+                break;
             case "suggested_description":
                 msg = "The description has been suggested!";
                 break;