diff --git a/openbsc/src/gprs/gtphub.c b/openbsc/src/gprs/gtphub.c
index 6dc1ea0..78e8c90 100644
--- a/openbsc/src/gprs/gtphub.c
+++ b/openbsc/src/gprs/gtphub.c
@@ -1277,6 +1277,8 @@
 			te = &tun->endpoint[side_idx][plane_idx];
 			te2 = &new_tun->endpoint[side_idx][plane_idx];
 			if ((te->tei_orig != te2->tei_orig)
+			    || (!te->peer)
+			    || (!te2->peer)
 			    || !gsn_addr_same(&te->peer->peer_addr->addr,
 					      &te2->peer->peer_addr->addr))
 				continue;