diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 396beff3f1..872d08776a 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -277,8 +277,6 @@ int backend_shutdown( Backend *be )
 
 	/* close each backend database */
 	for( i = 0; i < nBackendDB; i++ ) {
-		BackendInfo  *bi;
-
 		if ( backendDB[i].bd_info->bi_db_close ) {
 			backendDB[i].bd_info->bi_db_close(
 				&backendDB[i] );
@@ -287,7 +285,7 @@ int backend_shutdown( Backend *be )
 		if(rc != 0) {
 			Debug( LDAP_DEBUG_ANY,
 				"backend_close: bi_close %s failed!\n",
-				bi->bi_type, 0, 0 );
+				backendDB[i].be_type, 0, 0 );
 		}
 	}
 
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index e2ecd1ad10..c20c28035e 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -125,6 +125,7 @@ do_search(
 			send_ldap_result( conn, op, err,
 				NULL, "Bad search filter", NULL, NULL );
 		}
+		rc = -1;
 		goto return_results;
 	}