diff --git a/lib/cli/runner.rb b/lib/cli/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/cli/runner.rb
+++ b/lib/cli/runner.rb
@@ -410,8 +410,7 @@ class VMC::Cli::Runner
 
   def run
 
-    trap('TERM') { print "\nInterrupted\n"; exit(false)}
-    trap('INT')  { print "\nInterrupted\n"; exit(false)}
+    trap('TERM') { print "\nTerminated\n"; exit(false)}
 
     parse_options!
 
@@ -467,6 +466,9 @@ class VMC::Cli::Runner
     puts e.message.red
     puts e.backtrace
     @exit_status = false
+  rescue Interrupt => e
+    say("\nInterrupted".red)
+    @exit_status = false
   rescue => e
     puts e.message.red
     puts e.backtrace
catch interrupts as an exception so it can be caught elsewhere too

Change-Id: I0d<I>c<I>c<I>bf<I>eaf<I>a<I>ee0c<I>c