diff --git a/lib/cryptcheck.rb b/lib/cryptcheck.rb
index 5f29be8..cfc5761 100644
--- a/lib/cryptcheck.rb
+++ b/lib/cryptcheck.rb
@@ -102,7 +102,9 @@ module CryptCheck
 					end
 				end
 			rescue => e
-				e = "Too long analysis (max #{MAX_ANALYSIS_DURATION.humanize})" if e.message == 'execution expired'
+				e = Tls::Server::TLSException.new "Too long analysis (max #{MAX_ANALYSIS_DURATION.humanize})" \
+ 						if e.message == 'execution expired'
+				raise unless e.is_a? Tls::Server::TLSException
 				Logger.error e
 				[key, AnalysisFailure.new(e)]
 			end