diff --git a/lib/cryptcheck/tls/server.rb b/lib/cryptcheck/tls/server.rb
index a8735a1..f19c830 100644
--- a/lib/cryptcheck/tls/server.rb
+++ b/lib/cryptcheck/tls/server.rb
@@ -284,8 +284,9 @@ module CryptCheck
 						@cert, @chain = ssl_client(method) { |s| [s.peer_cert, s.peer_cert_chain] }
 						Logger.debug { "Certificate #{@cert.subject}" }
 						break
-					rescue TLSTimeout, ::SystemCallError
+					rescue Timeout, TLSTimeout, ConnectionError, ::SystemCallError
 						raise
+					rescue
 					end
 				end
 				raise TLSNotAvailableException unless @cert