diff --git a/VERSION b/VERSION
index e0da8ae09ae60f2173f5ab88e31a7359c855066a..3bac779c0a09053c4968ba844b98e5dc7abb43f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-309
\ No newline at end of file
+310
\ No newline at end of file
diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m b/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m
index 91c3feb32196a663cebabbf63b15db619f8a15d7..2248946335d6fb9307ff12a0f963e7ef88447625 100644
--- a/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m
@@ -11,8 +11,10 @@ end
 result = false;
 
 if artoa.controller.edit.dataPointsSelected(artoaWorkspace.editTimeOfArrival)
-    if ~pForce || strcmp(questdlg('Reset current selection?', 'Confirmation', 'Yes', 'Cancel', 'Cancel'), 'Cancel')
-        return;
+    if ~pForce
+        if strcmp(questdlg('Reset current selection?', 'Confirmation', 'Yes', 'Cancel', 'Cancel'), 'Cancel')
+            return;
+        end
     end
     % reset the line and all required fields
     [artoaGui.editTimeOfArrival, artoaWorkspace.editTimeOfArrival] = artoa.controller.edit.clearSelection(artoaGui.editTimeOfArrival, artoaWorkspace.editTimeOfArrival);
diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m b/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m
index cdf5800c25b52329bddc0214bad4efeddbf799dc..6ef9c153baa2daae356376e29a56207d1b824b82 100644
--- a/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m
@@ -42,7 +42,7 @@ values = inputdlg(values);
 values = str2double(values);
 
 % validity check
-if any(isnan(values))
+if any(isnan(values)) || isempty(values)
     % force drop selection
     artoa.controller.edit.timeOfArrival.dropSelection(true);
     warndlg('One or more input values could not be converted to double. Please try again', 'Input error!');