diff --git a/bin/dig.js b/bin/dig.js
index 729243b..b63cb4b 100755
--- a/bin/dig.js
+++ b/bin/dig.js
@@ -278,6 +278,7 @@ cli.main(function (args, cli) {
         return;
       }
       cli.type = cli.t = arg.toUpperCase();
+      return;
     }
 
     if (/^\+time=/.test(arg)) {
@@ -287,6 +288,7 @@ cli.main(function (args, cli) {
         return;
       }
       cli.timeout = Math.round(parseInt(arg.replace(/\+time=/, ''), 10) * 1000);
+      return;
     }
 
     if (/^@/.test(arg)) {
@@ -296,10 +298,11 @@ cli.main(function (args, cli) {
         return;
       }
       cli.nameserver = cli.n = arg;
+      return;
     }
 
     if (cli.query) {
-      console.error("'@server' was specified more than once");
+      console.error("'query' was specified more than once");
       process.exit(1);
       return;
     }