diff --git a/lib/mrsk/cli/registry.rb b/lib/mrsk/cli/registry.rb
index f854d8f9..dffcdff7 100644
--- a/lib/mrsk/cli/registry.rb
+++ b/lib/mrsk/cli/registry.rb
@@ -3,6 +3,7 @@ class Mrsk::Cli::Registry < Mrsk::Cli::Base
   def login
     run_locally    { execute *MRSK.registry.login }
     on(MRSK.hosts) { execute *MRSK.registry.login }
+  # FIXME: This rescue needed?
   rescue ArgumentError => e
     puts e.message
   end
@@ -10,6 +11,7 @@ class Mrsk::Cli::Registry < Mrsk::Cli::Base
   desc "logout", "Log out of registry remotely"
   def logout
     on(MRSK.hosts) { execute *MRSK.registry.logout }
+  # FIXME: This rescue needed?
   rescue ArgumentError => e
     puts e.message
   end