diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c
index ea78c1098e..91c5a74626 100644
--- a/servers/slapd/back-bdb/index.c
+++ b/servers/slapd/back-bdb/index.c
@@ -254,6 +254,16 @@ static int indexer(
 	}
 
 done:
+	switch( rc ) {
+	/* The callers all know how to deal with these results */
+	case 0:
+	case DB_LOCK_DEADLOCK:
+	case DB_LOCK_NOTGRANTED:
+		break;
+	/* Anything else is bad news */
+	default:
+		rc = LDAP_OTHER;
+	}
 	return rc;
 }