diff --git a/sapi/driver/rsi_wlan.c b/sapi/driver/rsi_wlan.c
index 91a4c746..b516d10a 100644
--- a/sapi/driver/rsi_wlan.c
+++ b/sapi/driver/rsi_wlan.c
@@ -2284,7 +2284,7 @@ int32_t rsi_driver_process_wlan_recv_cmd(rsi_pkt_t *pkt)
     rsi_semaphore_post(&rsi_driver_cb_non_rom->wlan_cmd_sem);
 
   } else if (cmd_type == RSI_WLAN_RSP_SOCKET_CREATE || cmd_type == RSI_WLAN_RSP_CONN_ESTABLISH) {
-    if (sockID >= 0) {
+    if (sockID >= 0 && sockID < NUMBER_OF_SOCKETS) {
       rsi_wlan_socket_set_status(status, sockID);
       if (rsi_socket_pool_non_rom[sockID].socket_wait_bitmap & BIT(0)) {
 #ifndef RSI_SOCK_SEM_BITMAP
@@ -2966,7 +2966,7 @@ void rsi_check_wlan_buffer_full(rsi_pkt_t *pkt)
       rsi_semaphore_post(&rsi_driver_cb_non_rom->send_data_sem);
     } else if (rsi_driver_cb->wlan_cb->expected_response != RSI_WLAN_RSP_TCP_ACK_INDICATION) {
       sockID = rsi_get_application_socket_descriptor(send->socket_id[0]);
-      if (sockID >= 0) {
+      if (sockID >= 0 && sockID < NUMBER_OF_SOCKETS) {
         rsi_wlan_socket_set_status(RSI_SUCCESS, sockID);
 #ifndef RSI_SOCK_SEM_BITMAP
         rsi_socket_pool_non_rom[sockID].socket_wait_bitmap &= ~BIT(2);
diff --git a/third_party/mqtt_client/src/MQTTClient.c b/third_party/mqtt_client/src/MQTTClient.c
index d88daaad..0874eefd 100644
--- a/third_party/mqtt_client/src/MQTTClient.c
+++ b/third_party/mqtt_client/src/MQTTClient.c
@@ -81,14 +81,14 @@ int decodePacket(Client* c, int* value, int timeout)
     {
         int rc = MQTTPACKET_READ_ERROR;
 
-        if (++len > MAX_NO_OF_REMAINING_LENGTH_BYTES)
+        if (len + 1 > MAX_NO_OF_REMAINING_LENGTH_BYTES)
         {
-            rc = MQTTPACKET_READ_ERROR; /* bad data */
             goto exit;
         }
         rc = c->ipstack->mqttread(c->ipstack, &i, 1, timeout);
         if (rc != 1)
             goto exit;
+        len++;
         *value += (i & 127) * multiplier;
         multiplier *= 128;
     } while ((i & 128) != 0);
@@ -104,17 +104,24 @@ int readPacket(Client* c, Timer* timer)
     int len = 0;
     int rem_len = 0;
 
+    /* Pull out the amount of time we have left.  If we successfully read data
+     * in step 1, we will continue through steps 2 and 3 with the same amount
+     * of time left to ensure that we finish reading the packet even if we
+     * exceed the total amount of time allotted to this call. */
+    const int left = left_ms_mqtt(timer);
+
     /* 1. read the header byte.  This has the packet type in it */
-    if (c->ipstack->mqttread(c->ipstack, c->readbuf, 1, left_ms_mqtt(timer)) != 1)
+    if (c->ipstack->mqttread(c->ipstack, c->readbuf, 1, left) != 1)
         goto exit;
 
     len = 1;
     /* 2. read the remaining length.  This is variable in itself */
-    decodePacket(c, &rem_len, left_ms_mqtt(timer));
+    if (decodePacket(c, &rem_len, left) == 0)
+        goto exit;
     len += MQTTPacket_encode(c->readbuf + 1, rem_len); /* put the original remaining length back into the buffer */
 
     /* 3. read the rest of the buffer using a callback to supply the rest of the data */
-    if (rem_len > 0 && (c->ipstack->mqttread(c->ipstack, c->readbuf + len, rem_len, left_ms_mqtt(timer)) != rem_len))
+    if (rem_len > 0 && (c->ipstack->mqttread(c->ipstack, c->readbuf + len, rem_len, left) != rem_len))
         goto exit;
 
     header.byte = c->readbuf[0];
@@ -190,11 +197,10 @@ int deliverMessage(Client* c, MQTTString* topicName, MQTTMessage* message)
 
 int keepalive(Client* c)
 {
-    int rc = FAILURE;
+    int rc = SUCCESS;
 
     if (c->keepAliveInterval == 0)
     {
-        rc = SUCCESS;
         goto exit;
     }
 
@@ -220,7 +226,7 @@ int keepalive(Client* c)
 int cycle(Client* c, Timer* timer)
 {
     // read the socket, see what work is due
-    unsigned short packet_type = readPacket(c, timer);
+    int packet_type = readPacket(c, timer);
     
     int len = 0,
         rc = SUCCESS;
@@ -233,7 +239,7 @@ int cycle(Client* c, Timer* timer)
             break;
         case PUBLISH:
         {
-            MQTTString topicName;
+            MQTTString topicName = MQTTString_initializer;
             MQTTMessage msg;
             if (MQTTDeserialize_publish((unsigned char*)&msg.dup, (int*)&msg.qos, (unsigned char*)&msg.retained, (unsigned short*)&msg.id, &topicName,
                (unsigned char**)&msg.payload, (int*)&msg.payloadlen, c->readbuf, c->readbuf_size) != 1)
@@ -273,8 +279,17 @@ int cycle(Client* c, Timer* timer)
         case PINGRESP:
             c->ping_outstanding = 0;
             break;
+        case FAILURE:
+            /* Because packet types start at 1, if we get here we know that
+             * there was nothing to read from the socket.  This is not
+             * necessarily an error.  It could be that there was no data
+             * available. */
+            packet_type = SUCCESS;
+            break;
+    }
+    if (rc == SUCCESS) {
+        rc = keepalive(c);
     }
-    keepalive(c);
 exit:
     if (rc == SUCCESS)
         rc = packet_type;
diff --git a/third_party/mqtt_client/src/MQTT_sapi_wrappers.c b/third_party/mqtt_client/src/MQTT_sapi_wrappers.c
index 755d17fd..c3f9d300 100644
--- a/third_party/mqtt_client/src/MQTT_sapi_wrappers.c
+++ b/third_party/mqtt_client/src/MQTT_sapi_wrappers.c
@@ -127,12 +127,13 @@ int rsi_mqtt_write(Network* n, unsigned char* buffer, int len, int timeout_ms)
 void mqtt_disconnect(Network* n)
 {
 	rsi_shutdown(n->my_socket,0);
+	n->my_socket = -1;
 }
 
 
 void NewNetwork(Network* n)
 {
-	n->my_socket = 0;
+	n->my_socket = -1;
 	n->mqttread = rsi_mqtt_read;
 	n->mqttwrite = rsi_mqtt_write;
 	n->disconnect = mqtt_disconnect;