diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index f14b327019..3ffd188285 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -210,10 +210,13 @@ over_db_destroy(
 
 	rc = over_db_func( be, db_destroy );
 
-	for (next = on->on_next; on; on=next) {
-		next = on->on_next;
-		free( on );
+	if ( on ) {
+		for (next = on->on_next; on; on=next) {
+			next = on->on_next;
+			free( on );
+		}
 	}
+
 	free( oi );
 	return rc;
 }