diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 21a11dc42..c3e463139 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -1771,7 +1771,7 @@ gw_client_close(DCB *dcb)
             dcb->state == DCB_STATE_NOPOLLING ||
             dcb->state == DCB_STATE_ZOMBIE)
         {
-		if (!DCB_IS_CLONE(dcb) && protocol) CHK_PROTOCOL(protocol);
+		if (!DCB_IS_CLONE(dcb)) CHK_PROTOCOL(protocol);
         }
 #endif
 	LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index eb044c1fb..83e2912e5 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -128,10 +128,7 @@ void mysql_protocol_done (
         MySQLProtocol* p;
         server_command_t* scmd;
         server_command_t* scmd2;
-
-	if(dcb->protocol == NULL)
-	    return;
-
+        
         p = (MySQLProtocol *)dcb->protocol;
         
         spinlock_acquire(&p->protocol_lock);