diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c
index 2a19dda..1d50d4d 100644
--- a/src/hnbgw_hnbap.c
+++ b/src/hnbgw_hnbap.c
@@ -85,7 +85,10 @@
 	} else {
 		/* The message was not queued. Destroy the connection right away. */
 		hnb_context_release(ctx);
+		return rc;
 	}
+
+	return 0;
 }
 
 static int hnbgw_tx_hnb_register_acc(struct hnb_context *ctx)