diff --git a/modules/auxiliary/gather/checkpoint_hostname.rb b/modules/auxiliary/gather/checkpoint_hostname.rb
index 17ad406b1c..e8cf92b53f 100644
--- a/modules/auxiliary/gather/checkpoint_hostname.rb
+++ b/modules/auxiliary/gather/checkpoint_hostname.rb
@@ -51,19 +51,19 @@ class Metasploit3 < Msf::Auxiliary
 
 		sock.put("\x51\x00\x00\x00")
 		sock.put("\x00\x00\x00\x21")
-		res = sock.get(4)
+		res = sock.get_once(4)
 		if (res == "Y\x00\x00\x00")
 			print_good("Appears to be a CheckPoint Firewall...")
 			sock.put("\x00\x00\x00\x0bsecuremote\x00")
 			res = sock.get_once
-			if (res =~ /CN\=(.+),O\=(.+)\./i)
+			if (res =~ /CN=(.+),O=(.+)\./i)
 				fw_hostname = $1
 				sc_hostname = $2
 				print_good("Firewall Host: #{fw_hostname}")
 				print_good("SmartCenter Host: #{sc_hostname}")
 			end
 		else
-			print_error("Unexpected response:\r\n#{res.inspect}")
+			print_error("Unexpected response: '#{res.inspect}'")
 		end
 
 		report_info(fw_hostname,sc_hostname)