diff --git a/src/core/udp.c b/src/core/udp.c
index 919e2d84..063b3d56 100644
--- a/src/core/udp.c
+++ b/src/core/udp.c
@@ -457,7 +457,9 @@ udp_bind(struct udp_pcb *pcb, struct ip_addr *ipaddr, u16_t port)
 {
   struct udp_pcb *ipcb;
   u8_t rebind;
-  LWIP_DEBUGF(UDP_DEBUG | DBG_TRACE | 3, ("udp_bind(ipaddr = %lx, port = %u)\n", ipaddr->addr, port));
+  LWIP_DEBUGF(UDP_DEBUG | DBG_TRACE | 3, ("udp_bind(ipaddr = "));
+  ip_addr_debug_print(UDP_DEBUG, ipaddr);
+  LWIP_DEBUGF(UDP_DEBUG | DBG_TRACE | 3, (", port = %u)\n", port));
   rebind = 0;
   /* Check for double bind and rebind of the same pcb */
   for (ipcb = udp_pcbs; ipcb != NULL; ipcb = ipcb->next) {
diff --git a/src/include/ipv4/lwip/ip_addr.h b/src/include/ipv4/lwip/ip_addr.h
index 4ea94a07..ee2ec2d9 100644
--- a/src/include/ipv4/lwip/ip_addr.h
+++ b/src/include/ipv4/lwip/ip_addr.h
@@ -119,10 +119,10 @@ extern const struct ip_addr ip_addr_broadcast;
 
 
 #define ip_addr_debug_print(debug, ipaddr) LWIP_DEBUGF(debug, ("%u.%u.%u.%u", \
-        (unsigned int)(ntohl((ipaddr)->addr) >> 24) & 0xff, \
-        (unsigned int)(ntohl((ipaddr)->addr) >> 16) & 0xff, \
-        (unsigned int)(ntohl((ipaddr)->addr) >> 8) & 0xff, \
-        (unsigned int)ntohl((ipaddr)->addr) & 0xff))
+        ipaddr?(unsigned int)(ntohl((ipaddr)->addr) >> 24) & 0xff:0, \
+        ipaddr?(unsigned int)(ntohl((ipaddr)->addr) >> 16) & 0xff:0, \
+        ipaddr?(unsigned int)(ntohl((ipaddr)->addr) >> 8) & 0xff:0, \
+        ipaddr?(unsigned int)ntohl((ipaddr)->addr) & 0xff:0U))
 
 /* cast to unsigned int, as it is used as argument to printf functions
  * which expect integer arguments */
diff --git a/src/include/lwip/udp.h b/src/include/lwip/udp.h
index 4486d183..84d2bfde 100644
--- a/src/include/lwip/udp.h
+++ b/src/include/lwip/udp.h
@@ -38,8 +38,6 @@
 #include "lwip/inet.h"
 #include "lwip/ip.h"
 
-#include "lwip/err.h"
-
 #define UDP_HLEN 8
 
 struct udp_hdr {