diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c
index 484a168..ee65a91 100644
--- a/openbsc/src/gprs/gprs_llc.c
+++ b/openbsc/src/gprs/gprs_llc.c
@@ -513,14 +513,16 @@
 
 	/* 7.2.1.1 LLC belonging to unassigned TLLI+SAPI shall be discarded,
 	 * except UID and XID frames with SAPI=1 */
-	if (!lle && llhp.sapi == GPRS_SAPI_GMM &&
-	    (llhp.cmd == GPRS_LLC_XID || llhp.cmd == GPRS_LLC_UI)) {
-		/* FIXME: don't use the TLLI but the 0xFFFF unassigned? */
-		lle = lle_alloc(msgb_tlli(msg), llhp.sapi);
-	} else {
-		LOGP(DLLC, LOGL_NOTICE,
-			"unknown TLLI/SAPI: Silently dropping\n");
-		return 0;
+	if (!lle) {
+		if (llhp.sapi == GPRS_SAPI_GMM &&
+		    (llhp.cmd == GPRS_LLC_XID || llhp.cmd == GPRS_LLC_UI)) {
+			/* FIXME: don't use the TLLI but the 0xFFFF unassigned? */
+			lle = lle_alloc(msgb_tlli(msg), llhp.sapi);
+		} else {
+			LOGP(DLLC, LOGL_NOTICE,
+				"unknown TLLI/SAPI: Silently dropping\n");
+			return 0;
+		}
 	}
 
 	/* Update LLE's (BVCI, NSEI) tuple */