diff --git a/modules/auxiliary/scanner/mysql/mysql_version.rb b/modules/auxiliary/scanner/mysql/mysql_version.rb
index f510a64862..6a0b2e27e1 100644
--- a/modules/auxiliary/scanner/mysql/mysql_version.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_version.rb
@@ -37,8 +37,12 @@ class Metasploit3 < Msf::Auxiliary
 	def run_host(ip)
 		begin
 			s = connect(false)
-			data = s.get
+			data = s.get_once(-1,10)
 			disconnect(s)
+			if data.nil?
+				print_error "The connection to #{rhost}:#{rport} timed out"
+				return
+			end
 		rescue ::Rex::ConnectionError, ::EOFError
 			return
 		rescue ::Exception