Only select TLLI, if it is valid (and not unset)
diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp
index 8e10801..7273362 100644
--- a/src/gprs_rlcmac.cpp
+++ b/src/gprs_rlcmac.cpp
@@ -188,7 +188,7 @@
 	if (dir == GPRS_RLCMAC_UL_TBF) {
 		llist_for_each_entry(tbf, &gprs_rlcmac_ul_tbfs, list) {
 			if (tbf->state != GPRS_RLCMAC_RELEASING
-			 && tbf->tlli == tlli)
+			 && tbf->tlli == tlli && tbf->tlli_valid)
 				return tbf;
 		}
 	} else {
@@ -793,8 +793,7 @@
 		return -EINVAL;
 	}
 
-	if (tbf->tlli_valid) 
-		ul_tbf = tbf_by_tlli(tbf->tlli, GPRS_RLCMAC_UL_TBF);
+	ul_tbf = tbf_by_tlli(tbf->tlli, GPRS_RLCMAC_UL_TBF);
 
 	tbf_unlink_pdch(tbf);
 	rc = bts->alloc_algorithm(ul_tbf, tbf, bts->alloc_algorithm_curst);