diff --git a/modules/auxiliary/scanner/discovery/sweep_udp.rb b/modules/auxiliary/scanner/discovery/sweep_udp.rb
index 3d0e60a587..4f89f688bd 100644
--- a/modules/auxiliary/scanner/discovery/sweep_udp.rb
+++ b/modules/auxiliary/scanner/discovery/sweep_udp.rb
@@ -75,7 +75,9 @@ class Auxiliary::Scanner::Discovery::SweepUDP < Msf::Auxiliary
 				parse_reply(r)
 			end
 			
-		rescue => e
+		rescue ::Interrupt
+			raise $!
+		rescue ::Exception => e
 			print_status("Unknown error: #{e.to_s}")
 			print_status(e.backtrace.join("\n"))
 		end
@@ -114,10 +116,10 @@ class Auxiliary::Scanner::Discovery::SweepUDP < Msf::Auxiliary
 				inf = ver if ver
 			when 137
 				app = 'NetBIOS'
-				# inf = pkt[0].unpack('H*')[0]
+				inf = pkt[0].unpack('H*')[0]
 			when 111
 				app = 'Portmap'
-				# inf = pkt[0].unpack('H*')[0]
+				inf = pkt[0].unpack('H*')[0]
 			when 1434
 				app = 'SQL Server'
 				mssql_ping_parse(pkt[0]).each_pair { |k,v|
diff --git a/modules/exploits/hpux/lpd/cleanup_exec.rb b/modules/exploits/hpux/lpd/cleanup_exec.rb
index 442ea40a85..3fc9efb289 100644
--- a/modules/exploits/hpux/lpd/cleanup_exec.rb
+++ b/modules/exploits/hpux/lpd/cleanup_exec.rb
@@ -80,7 +80,6 @@ class Exploits::Hpux::Lpd::CleanupExec < Msf::Exploit::Remote
 			return
 		end
 		
-		
 		print_status("Forcing an error and hijacking the cleanup routine...")
 		
 		begin
diff --git a/modules/exploits/osx/afp/loginext.rb b/modules/exploits/osx/afp/loginext.rb
index 5d7545a955..21492be326 100644
--- a/modules/exploits/osx/afp/loginext.rb
+++ b/modules/exploits/osx/afp/loginext.rb
@@ -24,8 +24,8 @@ class Exploits::Osx::Afp::AFPLoginExt < Msf::Exploit::Remote
 				[
 					[ 'BID', '10271'],
 					[ 'CVE', '2004-0430'],
-					[ 'OSVDB', '5762'    ],
-					[ 'MIL', '2'       ],
+					[ 'OSVDB', '5762'],
+					[ 'MIL', '2'],
 				],
 			'Payload'        =>
 				{