diff --git a/bin/gollum b/bin/gollum
index 7559f12d..9d9544e4 100755
--- a/bin/gollum
+++ b/bin/gollum
@@ -172,6 +172,7 @@ MSG
   end
   opts.on('--version', 'Display the current version of Gollum.') do
     puts 'Gollum ' + Gollum::VERSION
+    exit 0
   end
   opts.on('--versions', 'Display the current version of Gollum and auxiliary gems.') do
     require 'gollum-lib'
diff --git a/bin/gollum-migrate-tags b/bin/gollum-migrate-tags
index f8bb91de..c52d59b4 100755
--- a/bin/gollum-migrate-tags
+++ b/bin/gollum-migrate-tags
@@ -4,8 +4,6 @@ require 'optparse'
 require 'pathname'
 require 'rubygems'
 
-REPO = ARGV[0] || Dir.pwd
-
 wiki_options = {}
 options = {}
 
@@ -89,6 +87,8 @@ rescue OptionParser::InvalidOption
   exit
 end
 
+REPO = ARGV[0] || Dir.pwd
+
 require 'gollum-lib'
 
 if cfg = options[:config]