diff --git a/libbbfdm/scripts/bbf_api b/libbbfdm/scripts/bbf_api
index 1945f38d..0132c434 100755
--- a/libbbfdm/scripts/bbf_api
+++ b/libbbfdm/scripts/bbf_api
@@ -33,7 +33,7 @@ get_ip_addr_used() {
 		if [ -n "$interface" ]; then
 			ip_addr_used=$(ifstatus "$interface" | jsonfilter -e '@["ipv6-address"][0].address')
 		else
-			ip_addr_used=$(ip -6 route | grep default | awk -F ' ' '{print $9}')
+			ip_addr_used=$(ip -6 route | grep default | awk -F ' ' '{print $3}' | head -n 1)
 		fi
 	else
 		if [ -n "$interface" ]; then
diff --git a/libbbfdm/scripts/ipping b/libbbfdm/scripts/ipping
index 38a0a508..18171a25 100755
--- a/libbbfdm/scripts/ipping
+++ b/libbbfdm/scripts/ipping
@@ -25,8 +25,9 @@ ipping_error() {
 	# Store data in dmmap_diagnostics for both protocols (cwmp/usp)
 	[ "$3" = "both_proto" ] && {
 		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.DiagnosticState="$1"
+		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.IPAddressUsed=""
 		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.SuccessCount=0
-		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.FailureCount="$cnt"
+		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.FailureCount="$2"
 		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.AverageResponseTime=0
 		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.MinimumResponseTime=9999
 		$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.MaximumResponseTime=0
@@ -80,13 +81,7 @@ ipping_launch() {
 
 		res=$(ping -q ${ip_proto} -c 1 -s ${dsize} -W ${timeout} ${device} "${host}" 2>&1)
 
-		ba=$(echo "$res" | grep "bad address")
-		[ -n "$ba" ] && {
-			ipping_error "Error_CannotResolveHostName" "${nbr_of_rep}" "${proto}"
-			return
-		}
-
-		ba=$(echo "$res" | grep "unknown host")
+		ba=$(echo "$res" | grep -E "bad address|unknown host|Name does not resolve")
 		[ -n "$ba" ] && {
 			ipping_error "Error_CannotResolveHostName" "${nbr_of_rep}" "${proto}"
 			return