diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 71069dc..85b861c 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -526,8 +526,12 @@
 	gsms->dst.ton = (address_lv[1] >> 4) & 7;
 	gsms->dst.npi = address_lv[1] & 0xF;
 	/* convert to real number */
-	gsm48_decode_bcd_number(gsms->dst.addr,
-				sizeof(gsms->dst.addr), address_lv, 1);
+	if (gsm48_decode_bcd_number2(gsms->dst.addr,
+				     sizeof(gsms->dst.addr), address_lv, da_len_bytes, 1)) {
+		LOG_TRANS(trans, LOGL_ERROR, "Failed to decode destination Address\n");
+		rc = GSM411_RP_CAUSE_SEMANT_INC_MSG;
+		goto out;
+	}
 	smsp += da_len_bytes;
 
 	gsms->protocol_id = *smsp++;