0
@@ -86,8 +86,21 @@ Main {
0
                                          :force => params["force"].value,
0
                                          :dry_run => params["dry-run"].value,
0
                                          :repository_type => params["repository-type"].value)
0
-                                       
0
-      cmd.run(params[:repository].value, self.target_revision, params[:directory].value)
0
+
0
+      begin
0
+        cmd.run(params[:repository].value, self.target_revision, params[:directory].value)
0
+      rescue Piston::Repository::UnhandledUrl => e
0
+        supported_types = Piston::Repository.handlers.collect do |handler|
0
+          handler.repository_type
0
+        end
0
+        puts "Unsure how to handle:"
0
+        puts "\t#{params[:repository].value.inspect}."
0
+        puts "You should try using --repository-type. Supported types are:"
0
+        supported_types.each do |type|
0
+          puts "\t#{type}"
0
+        end
0
+        exit_failure!
0
+      end
0
     end
0
   end
0
 

0
@@ -16,14 +16,9 @@ module Piston
0
           logger.debug {"Asking #{handler}"}
0
           handler.understands_url?(url)
0
         end
0
-
0
-        if handler.nil?
0
-          supported_types = handlers.collect do |handler|
0
-            handler.repository_type
0
-          end
0
-          message = "No internal handlers found for #{url.inspect}. You should check out --repository-type. Supported types are: #{supported_types.join(', ')}"
0
-          raise UnhandledUrl, message
0
-        end
0
+        
0
+        raise UnhandledUrl unless handler
0
+        
0
         handler.new(url)
0
       end
0
 
0
@@ -35,7 +30,6 @@ module Piston
0
       def handlers
0
         @@handlers
0
       end
0
-      private :handlers
0
     end
0
 
0
     attr_reader :url