diff --git a/Internet/MQTT/MQTTPacket/src/MQTTFormat.c b/Internet/MQTT/MQTTPacket/src/MQTTFormat.c
index 1fcbb31..40a56d4 100644
--- a/Internet/MQTT/MQTTPacket/src/MQTTFormat.c
+++ b/Internet/MQTT/MQTTPacket/src/MQTTFormat.c
@@ -178,7 +178,9 @@ char* MQTTFormat_toClientString(char* strbuf, int32_t strbuflen, uint8_t* buf, i
       strindex = snprintf(strbuf, strbuflen, "%s", MQTTPacket_names[header.bits.type]);
       break;
   }
-	
+
+  (void) strindex;
+
   return strbuf;
 }
 
@@ -260,6 +262,7 @@ char* MQTTFormat_toServerString(char* strbuf, int32_t strbuflen, uint8_t* buf, i
       break;
   }
 
+  (void) strindex;
   strbuf[strbuflen] = '\0';
   return strbuf;
 }
diff --git a/mqtt.c b/mqtt.c
index f8a1e67..3315ab4 100644
--- a/mqtt.c
+++ b/mqtt.c
@@ -56,11 +56,11 @@ void mqtt_pub(Client* mqtt_client, char * mqtt_topic, char * mqtt_msg, int mqtt_
 	{
 		printf(" - ERROR\r\n");
 		//Reboot device after 20 continuous errors (~ 20sec)
-        while(1);
-		//if(mqtt_err_cnt++ > 20)
-		//{
-		//	printf("Connection with MQTT Broker was lost!!\r\nReboot the board..\r\n");
-		//	while(1);
-		//}
+        //while(1);
+		if(mqtt_err_cnt++ > 20)
+		{
+			printf("Connection with MQTT Broker was lost!!\r\nReboot the board..\r\n");
+			while(1);
+		}
 	}
 }