diff --git a/bin/gollum b/bin/gollum
index 603c8dd5..4e257208 100755
--- a/bin/gollum
+++ b/bin/gollum
@@ -37,7 +37,13 @@ opts = OptionParser.new do |opts|
 end
 
 # Read command line options into `options` hash
-opts.parse!
+begin
+  opts.parse!
+rescue OptionParser::InvalidOption
+  puts "gollum: #{$!.message}"
+  puts "gollum: try 'gollum --help' for more information"
+  exit
+end
 
 gollum_path = ARGV[0] || Dir.pwd