diff --git a/package/gluon-airtime/src/ifaces.c b/package/gluon-airtime/src/ifaces.c
index cbb9ff18..f9d0514d 100644
--- a/package/gluon-airtime/src/ifaces.c
+++ b/package/gluon-airtime/src/ifaces.c
@@ -53,8 +53,6 @@ struct iface_list *get_ifaces() {
 
 #undef CHECK
 
-	return ifaces;
-
 out:
 	if (msg)
 		nlmsg_free(msg);
@@ -62,5 +60,5 @@ out:
 	if (sk)
 		nl_socket_free(sk);
 
-	return NULL;
+	return ifaces;
 }
diff --git a/package/gluon-airtime/src/respondd.c b/package/gluon-airtime/src/respondd.c
index d4c0a511..0de1f49d 100644
--- a/package/gluon-airtime/src/respondd.c
+++ b/package/gluon-airtime/src/respondd.c
@@ -24,7 +24,7 @@ void fill_airtime_json(struct airtime_result *air, struct json_object *wireless)
 }
 
 static struct json_object *respondd_provider_statistics(void) {
-	struct airtime_result airtime;
+	struct airtime_result airtime = {};
 	struct json_object *result, *wireless;
 	struct iface_list *ifaces;
 	void *freeptr;