diff --git a/release.fish b/release.fish
index 8e0f28727acc68bf9dada9ba7de4c163e0bfe7ba..66323e0825376b34446532cd880f2c748964c766 100755
--- a/release.fish
+++ b/release.fish
@@ -54,9 +54,19 @@ while test $i -le (count $argv)
     switch $argv[$i]
         case --from
             set i (math $i + 1)
+            if test $i -gt (count $argv)
+                echo "Error: --from requires a value" >&2
+                __release_lune_usage >&2
+                exit 1
+            end
             set -g __rl_from $argv[$i]
         case --only
             set i (math $i + 1)
+            if test $i -gt (count $argv)
+                echo "Error: --only requires a value" >&2
+                __release_lune_usage >&2
+                exit 1
+            end
             set -g __rl_only $argv[$i]
         case --help -h
             __release_lune_usage