diff --git a/lib/handle_unsuback.c b/lib/handle_unsuback.c
index b79916bc..ca7cf7d9 100644
--- a/lib/handle_unsuback.c
+++ b/lib/handle_unsuback.c
@@ -86,7 +86,6 @@ int handle__unsuback(struct mosquitto *mosq)
 				return rc;
 			}
 			reason_codes[i] = (int)byte;
-			i++;
 		}
 	}
 
diff --git a/test/lib/c/02-unsubscribe2-v5.c b/test/lib/c/02-unsubscribe2-v5.c
index 3a96f6c3..87a9e24c 100644
--- a/test/lib/c/02-unsubscribe2-v5.c
+++ b/test/lib/c/02-unsubscribe2-v5.c
@@ -8,7 +8,7 @@ static int run = -1;
 static void on_connect(struct mosquitto *mosq, void *obj, int rc)
 {
 	int rc2;
-	mosquitto_property *proplist;
+	mosquitto_property *proplist = NULL;
 	(void)obj;
 
 	if(rc){