diff --git a/lib/rex/proto/smb/simpleclient.rb.ut.rb b/lib/rex/proto/smb/simpleclient.rb.ut.rb
index 78a9178c51..3c3b131a70 100644
--- a/lib/rex/proto/smb/simpleclient.rb.ut.rb
+++ b/lib/rex/proto/smb/simpleclient.rb.ut.rb
@@ -95,10 +95,10 @@ class Rex::Proto::SMB::SimpleClient::UnitTest < Test::Unit::TestCase
             4
         )
 			
-        # Evasion techniques:
+		# Evasion techniques:
 		# 	1) Write the bind out a few bytes at a time with a random offset
 		#	2) Read the response back a few bytes at a time with a random offset
-			
+
 		# Write the bind request out in random chunk sizes
 		while (bind.length > 0)
 		    f.write( bind.slice!(0, (rand(20)+5)), rand(1024)+1 )
diff --git a/msfconsole b/msfconsole
index 7d738ab6fc..54510fd914 100755
--- a/msfconsole
+++ b/msfconsole
@@ -9,4 +9,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'rex'
 require 'msf/ui'
 
-Msf::Ui::Console::Driver.new.run
+begin
+	Msf::Ui::Console::Driver.new.run
+rescue Interrupt
+end