diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c
index 9d2c774..ee296d1 100644
--- a/openbsc/src/gprs/gb_proxy.c
+++ b/openbsc/src/gprs/gb_proxy.c
@@ -792,20 +792,20 @@
 	int rc;
 
 	peer = gbproxy_peer_by_bvci(cfg, ns_bvci);
+	if (!peer) {
+		LOGP(DGPRS, LOGL_NOTICE, "Didn't find peer for "
+		     "BVCI=%u for PTP message from NSVC=%u/NSEI=%u (BSS), "
+		     "discarding message\n",
+		     ns_bvci, nsvci, nsei);
+		return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI,
+				       &ns_bvci, msg);
+	}
 
 	check_peer_nsei(peer, nsei);
-	rc = gbprox_process_bssgp_ul(cfg, msg, peer);
-	if (!rc) {
-		if (!peer) {
-			LOGP(DGPRS, LOGL_NOTICE, "Didn't find peer for "
-			     "BVCI=%u for PTP message from NSVC=%u/NSEI=%u (BSS)\n",
-			     ns_bvci, nsvci, nsei);
-			return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI,
-					       &ns_bvci, msg);
-		}
 
+	rc = gbprox_process_bssgp_ul(cfg, msg, peer);
+	if (!rc)
 		return 0;
-	}
 
 	switch (pdu_type) {
 	case BSSGP_PDUT_FLOW_CONTROL_BVC: