lib/cms_scanner.rb in cms_scanner-0.0.37.12 vs lib/cms_scanner.rb in cms_scanner-0.0.38.0

@@ -101,14 +101,14 @@
       controllers.run
     rescue OptParseValidator::NoRequiredOption => e
       @run_error = e
 
       formatter.output('@usage', msg: e.message)
-    rescue Interrupt, StandardError => e
+    rescue StandardError, SignalException => e
       @run_error = e
 
       formatter.output('@scan_aborted',
-                       reason: e.message,
+                       reason: e.is_a?(Interrupt) ? 'Canceled by User' : e.message,
                        trace: e.backtrace,
                        verbose: controllers.first.parsed_options[:verbose])
     ensure
       Browser.instance.hydra.abort