diff --git a/net/socket/getsockname.c b/net/socket/getsockname.c
index bed6217bcc..ea314a1a4f 100644
--- a/net/socket/getsockname.c
+++ b/net/socket/getsockname.c
@@ -101,16 +101,12 @@ int psock_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
       return -EBADF;
     }
 
-  /* Some sanity checking... Shouldn't need this on a buckled up embedded
-   * system (?)
-   */
+  /* Some sanity checking... */
 
-#ifdef CONFIG_DEBUG_FEATURES
-  if (addr == NULL || *addrlen <= 0)
+  if (addr == NULL || addrlen == NULL)
     {
       return -EINVAL;
     }
-#endif
 
   /* Let the address family's send() method handle the operation */