diff --git a/lib/twat/subcommands/base.rb b/lib/twat/subcommands/base.rb
index <HASH>..<HASH> 100644
--- a/lib/twat/subcommands/base.rb
+++ b/lib/twat/subcommands/base.rb
@@ -18,11 +18,15 @@ module Twat::Subcommands
 
     def needs_arguments(n)
       unless @argv.length == n
-        usage
-        exit
+        usage_and_exit!
       end
     end
 
+    def usage_and_exit!
+      usage
+      exit
+    end
+
     def auth!
       Twitter.configure do |twit|
         config.account.each do |key, value|
diff --git a/lib/twat/subcommands/update.rb b/lib/twat/subcommands/update.rb
index <HASH>..<HASH> 100644
--- a/lib/twat/subcommands/update.rb
+++ b/lib/twat/subcommands/update.rb
@@ -4,6 +4,7 @@ module Twat::Subcommands
     def run
       msg = @argv.join(" ")
       raise TweetTooLong if msg.length > 140
+      usage_and_exit! if msg == ""
 
       auth!
Exit when update called with no tweet