diff --git a/modules/exploits/multi/misc/java_jdwp_debugger.rb b/modules/exploits/multi/misc/java_jdwp_debugger.rb
index d19d28bac0..4c59ef5666 100644
--- a/modules/exploits/multi/misc/java_jdwp_debugger.rb
+++ b/modules/exploits/multi/misc/java_jdwp_debugger.rb
@@ -129,22 +129,16 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def check
     connect
-
-    vprint_status("#{peer} - Checking for Java Debugging Wire Protocol")
-
     res = handshake
-
     disconnect
 
-    unless res
-      vprint_error("Unable to determine due to a connection timeout")
+    if res.nil?
       return Exploit::CheckCode::Unknown
+    elsif res == HANDSHAKE
+      return Exploit::CheckCode::Appears
     end
 
-    return Exploit::CheckCode::Appears if res == HANDSHAKE
-
-    return Exploit::CheckCode::Safe
-
+    Exploit::CheckCode::Safe
   end