diff --git a/servers/slapd/back-mdb/index.c b/servers/slapd/back-mdb/index.c
index 4d2dc01457f07ab7b378ac311cbc350ca47a0a3f..2bde863a3ae45e4f1298b7a3febf19a86f8a9145 100644
--- a/servers/slapd/back-mdb/index.c
+++ b/servers/slapd/back-mdb/index.c
@@ -496,7 +496,7 @@ mdb_index_entry(
 
 	Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
 		opid == SLAP_INDEX_DELETE_OP ? "del" : "add",
-		(long) e->e_id, e->e_dn );
+		(long) e->e_id, e->e_dn ? e->e_dn : "" );
 
 	/* add each attribute to the indexes */
 	for ( ; ap != NULL; ap = ap->a_next ) {
@@ -569,7 +569,7 @@ mdb_index_entry(
 
 	Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
 		opid == SLAP_INDEX_DELETE_OP ? "del" : "add",
-		(long) e->e_id, e->e_dn );
+		(long) e->e_id, e->e_dn ? e->e_dn : "" );
 
 	return LDAP_SUCCESS;
 }
diff --git a/servers/slapd/back-mdb/tools.c b/servers/slapd/back-mdb/tools.c
index 2d733849a553074d8fc921cfa490eb37c51a846c..0ce1e22d21639c413382227e216bfb5f7880c778 100644
--- a/servers/slapd/back-mdb/tools.c
+++ b/servers/slapd/back-mdb/tools.c
@@ -805,8 +805,8 @@ int mdb_tool_entry_reindex(
 	 */
 
 	Debug( LDAP_DEBUG_TRACE,
-		"=> " LDAP_XSTRING(mdb_tool_entry_reindex) "( %ld, \"%s\" )\n",
-		(long) id, e->e_dn, 0 );
+		"=> " LDAP_XSTRING(mdb_tool_entry_reindex) "( %ld )\n",
+		(long) id, 0, 0 );
 
 	op.o_hdr = &ohdr;
 	op.o_bd = be;