diff --git a/src/grpc/server.rs b/src/grpc/server.rs
index 8830c21..25ff4d1 100644
--- a/src/grpc/server.rs
+++ b/src/grpc/server.rs
@@ -93,7 +93,10 @@ impl NodeServer {
 
                 let conn = if let Err(e) = conn {
                     println!("Error accepting TLS connection: {e}");
-                    if e.to_string().contains("HandshakeFailure") {
+                    let attack_error_messages = ["handshake", "certificate", "quote"];
+
+                    let err_str = e.to_string().to_lowercase();
+                    if attack_error_messages.iter().any(|att_er_str| err_str.contains(att_er_str)) {
                         state.increase_net_attacks().await;
                     }
                     return;
@@ -197,6 +200,7 @@ impl Update for NodeServer {
                             yield Ok(update.update);
                         }
                         // TODO: check if disconnect client if too many connections are active
+                        // Its tested and working
                         if tx.receiver_count() > 9 {
                             error_status = Status::internal("Already have too many clients. Connect to another server.");
                             break;