diff --git a/lib/twat/actions.rb b/lib/twat/actions.rb
index <HASH>..<HASH> 100644
--- a/lib/twat/actions.rb
+++ b/lib/twat/actions.rb
@@ -176,7 +176,12 @@ module Twat
     end
 
     def account
-      @account = config.accounts[account_name]
+      @account ||= config.accounts[account_name]
+      unless @account
+        raise NoSuchAccount
+      else
+        return @account
+      end
     end
 
     def account_name
Fix a broken test for account validity