diff --git a/net/socket/getpeername.c b/net/socket/getpeername.c
index 4181117c36f..b245e1720bb 100644
--- a/net/socket/getpeername.c
+++ b/net/socket/getpeername.c
@@ -105,12 +105,10 @@ int psock_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
    * system (?)
    */
 
-#ifdef CONFIG_DEBUG_FEATURES
-  if (addr == NULL || *addrlen <= 0)
+  if (addr == NULL || addrlen == NULL || *addrlen <= 0)
     {
       return -EINVAL;
     }
-#endif
 
   /* Let the address family's send() method handle the operation */
 
diff --git a/net/socket/getsockname.c b/net/socket/getsockname.c
index ea314a1a4fc..c151a69194a 100644
--- a/net/socket/getsockname.c
+++ b/net/socket/getsockname.c
@@ -103,7 +103,7 @@ int psock_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
 
   /* Some sanity checking... */
 
-  if (addr == NULL || addrlen == NULL)
+  if (addr == NULL || addrlen == NULL || *addrlen <= 0)
     {
       return -EINVAL;
     }
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index 807710f4631..7458361da7f 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -90,12 +90,10 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 {
   /* Verify that non-NULL pointers were passed */
 
-#ifdef CONFIG_DEBUG_FEATURES
   if (buf == NULL)
     {
       return -EINVAL;
     }
-#endif
 
   if (from != NULL && fromlen != NULL && *fromlen <= 0)
     {
diff --git a/net/socket/send.c b/net/socket/send.c
index afab5f2945a..8083ce6cc0d 100644
--- a/net/socket/send.c
+++ b/net/socket/send.c
@@ -91,12 +91,10 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len,
 
   /* Verify that non-NULL pointers were passed */
 
-#ifdef CONFIG_DEBUG_FEATURES
   if (buf == NULL)
     {
       return -EINVAL;
     }
-#endif
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
diff --git a/net/socket/sendto.c b/net/socket/sendto.c
index 7dd247975f2..bf7e29ae667 100644
--- a/net/socket/sendto.c
+++ b/net/socket/sendto.c
@@ -126,12 +126,10 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 
   /* Verify that non-NULL pointers were passed */
 
-#ifdef CONFIG_DEBUG_FEATURES
   if (buf == NULL)
     {
       return -EINVAL;
     }
-#endif
 
   /* If to is NULL or tolen is zero, then this function is same as send (for
    * connected socket types)