bin/docify in docify-1.0.1 vs bin/docify in docify-1.0.2

@@ -47,19 +47,24 @@
 
 begin
   optparse.parse!
   file = ARGV.shift.to_s.strip
   unless file.empty?
+    file = File.expand_path(file)
+    
     begin
       options[:format] = Docify.detect_format(file)
       doc = Docify::Document.new(file)
       doc.render(options[:format], options[:use_css])
       if options[:output].nil?
         puts doc.content
       else
         doc.save_to(options[:output])
       end
     rescue ArgumentError => e
+      puts "Error: #{e.message}"
+      exit
+    rescue Exception => e
       puts "Error: #{e.message}"
       exit
     end
   else
     puts optparse.to_s
\ No newline at end of file