bin/hc in hieracles-0.2.0 vs bin/hc in hieracles-0.2.1

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 
 require 'hieracles'
+require 'hieracles/options/hc'
 
-opt = Hieracles::Optparse.new(ARGV)
+opt = Hieracles::Options::Hc.new(ARGV)
 
 if opt.options.has_key? :version
   puts Hieracles.version
   exit(0)
 end
@@ -14,24 +15,29 @@
 fqdn = opt.payload[0]
 command = opt.payload[1]
 args = opt.payload[2..-1]
 
 unless fqdn && command
-  puts Hieracles::Help.usage
+  puts Hieracles::Options::Hc.usage
   exit(1)
 end
  
 if Hieracles::Format.method_defined? command
-  node = Hieracles::Node.new fqdn, opt.options
   begin
+    node = Hieracles::Node.new fqdn, opt.options
+  rescue Exception => e
+    puts "*** Error: #{e.message}"
+    exit(1)
+  end
+  begin
     formatter = Object.const_get("Hieracles::Formats::#{Hieracles::Config.format}")
   rescue
-    puts "  Unknown format #{Hieracles::Config.format}"
+    puts "*** Unknown format #{Hieracles::Config.format}"
     exit(1)
   end
   dispatch = formatter.new node
   puts dispatch.send(command.to_sym, args)
 else
-  puts "  Unknown command: #{command}"
-  Hieracles::Help.usage
+  puts "*** Unknown command: #{command}"
+  Hieracles::Options::Hc.usage
   exit(1)
 end