diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 1844ad3aaf..71b58ea3e0 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -314,7 +314,8 @@ long connection_init(
     assert( c->c_pending_ops == NULL );
 
     c->c_client_name = ch_strdup( name == NULL ? "" : name );
-    c->c_client_addr = ch_strdup( addr );
+	if ( addr != NULL )
+		c->c_client_addr = ch_strdup( addr );
 
     c->c_n_ops_received = 0;
 #ifdef LDAP_COUNTERS