diff --git a/openbsc/src/gprs/gb_proxy_patch.c b/openbsc/src/gprs/gb_proxy_patch.c
index 35355ba..32e844e 100644
--- a/openbsc/src/gprs/gb_proxy_patch.c
+++ b/openbsc/src/gprs/gb_proxy_patch.c
@@ -335,7 +335,10 @@
 		goto patch_error;
 	}
 
-	if (parse_ctx->tlli_enc && tlli_info) {
+	if (!tlli_info)
+		return;
+
+	if (parse_ctx->tlli_enc) {
 		uint32_t tlli = gbproxy_map_tlli(parse_ctx->tlli,
 						 tlli_info, parse_ctx->to_bss);
 
diff --git a/openbsc/src/gprs/gb_proxy_tlli.c b/openbsc/src/gprs/gb_proxy_tlli.c
index f554db1..91469b0 100644
--- a/openbsc/src/gprs/gb_proxy_tlli.c
+++ b/openbsc/src/gprs/gb_proxy_tlli.c
@@ -309,7 +309,7 @@
 {
 	struct gbproxy_tlli_info *tlli_info;
 	int enable_patching = -1;
-	int tlli_already_known;
+	int tlli_already_known = 0;
 
 	/* Check, whether the IMSI matches */
 	if (gprs_is_mi_imsi(imsi, imsi_len)) {