diff --git a/tests/t1500-do.sh b/tests/t1500-do.sh
index a0a1ff6..5c89696 100755
--- a/tests/t1500-do.sh
+++ b/tests/t1500-do.sh
@@ -12,6 +12,12 @@ usage: todo.sh do ITEM#[, ITEM#, ITEM#, ...]
 === 1
 EOF
 
+test_todo_session 'do missing ITEM#' <<EOF
+>>> todo.sh do
+usage: todo.sh do ITEM#[, ITEM#, ITEM#, ...]
+=== 1
+EOF
+
 cat > todo.txt <<EOF
 smell the uppercase Roses +flowers @outside
 notice the sunflowers
diff --git a/todo.sh b/todo.sh
index 5c051b1..73e2e9c 100755
--- a/todo.sh
+++ b/todo.sh
@@ -768,6 +768,7 @@ case $action in
     errmsg="usage: $TODO_SH do ITEM#[, ITEM#, ITEM#, ...]"
     # shift so we get arguments to the do request
     shift;
+    [ "$#" -eq 0 ] && die "$errmsg"
 
     # Split multiple do's, if comma seperated change to whitespace sepereated
     # Loop the 'do' function for each item