diff --git a/tests/t1020-addtolistfile.sh b/tests/t1020-addtolistfile.sh
index 575fb16..c2c672a 100755
--- a/tests/t1020-addtolistfile.sh
+++ b/tests/t1020-addtolistfile.sh
@@ -13,6 +13,7 @@ commands work, including support for filtering.
 test_todo_session 'nonexistant file' <<EOF
 >>> todo.sh addto garden.txt notice the daisies
 TODO: Destination file $HOME/garden.txt does not exist.
+=== 1
 EOF
 
 touch "$HOME/garden.txt"
diff --git a/tests/t1800-del.sh b/tests/t1800-del.sh
index 97738f2..ad8488c 100755
--- a/tests/t1800-del.sh
+++ b/tests/t1800-del.sh
@@ -139,7 +139,7 @@ EOF
 test_todo_session 'del nonexistant TERM' <<EOF
 >>> todo.sh del 1 dung
 1: (B) smell the uppercase Roses +flowers @outside
-'dung' not found; no removal done.
+TODO: 'dung' not found; no removal done.
 === 1
 
 >>> todo.sh -p list
diff --git a/todo.sh b/todo.sh
index d72d4e8..a1cd28c 100755
--- a/todo.sh
+++ b/todo.sh
@@ -569,8 +569,7 @@ _list() {
         ## Path relative to current working directory
         src="$FILE"
     else
-        echo "TODO: File $FILE does not exist."
-        exit 1
+        die "TODO: File $FILE does not exist."
     fi
 
     ## Get our search arguments, if any
@@ -734,7 +733,7 @@ case $action in
     if [ -f "$dest" ]; then
         _addto "$dest" "$input"
     else
-        echo "TODO: Destination file $dest does not exist."
+        die "TODO: Destination file $dest does not exist."
     fi
     ;;
 
@@ -764,7 +763,7 @@ case $action in
             echo "$item: $newtodo"
 	fi
     else
-        echo "TODO: Error appending task $item."
+        die "TODO: Error appending task $item."
     fi
     ;;
 
@@ -813,7 +812,7 @@ case $action in
         newtodo=$(sed "$item!d" "$TODO_FILE")
         if [ "$DELETEME" = "$newtodo" ]; then
             [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $DELETEME"
-            die "'$3' not found; no removal done."
+            die "TODO: '$3' not found; no removal done."
         fi
         if [ $TODOTXT_VERBOSE -gt 0 ]; then
             echo "$item: $DELETEME"