diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index be7b0aea0f..487890ef6a 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1412,7 +1412,8 @@ dnX509normalize( void *x509_name, struct berval *out )
 	int rc = ldap_X509dn2bv( x509_name, out, LDAPDN_rewrite, 0 );
 
 	Debug( LDAP_DEBUG_TRACE,
-		"dnX509Normalize: <%s>\n", out->bv_val, 0, 0 );
+		"dnX509Normalize: <%s> (%d)\n",
+		BER_BVISNULL( out ) ? "(null)" : out->bv_val, rc, 0 );
 
 	return rc;
 }