diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
index afabb92b7c058..37d2e5baf2cd0 100644
--- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
+++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
@@ -45,6 +45,7 @@
 import org.neo4j.graphdb.schema.ConstraintDefinition;
 import org.neo4j.graphdb.schema.IndexCreator;
 import org.neo4j.graphdb.schema.IndexDefinition;
+import org.neo4j.helpers.Exceptions;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.IteratorWrapper;
 import org.neo4j.helpers.collection.Visitor;
@@ -490,59 +491,80 @@ private void repopulateAllIndexes() throws IOException, IndexEntryConflictExcept
 
         final IndexRule[] rules = getIndexesNeedingPopulation();
         final List<IndexPopulatorWithSchema> populators = new ArrayList<>( rules.length );
-
-        final SchemaDescriptor[] descriptors = new LabelSchemaDescriptor[rules.length];
-
-        for ( int i = 0; i < rules.length; i++ )
+        try
         {
-            IndexRule rule = rules[i];
-            SchemaIndexDescriptor index = rule.getIndexDescriptor();
-            descriptors[i] = index.schema();
-            IndexPopulator populator = schemaIndexProviders.lookup( rule.getProviderDescriptor() )
-                                                .getPopulator( rule.getId(), index, new IndexSamplingConfig( config ) );
-            populator.create();
-            populators.add( new IndexPopulatorWithSchema( populator, index ) );
-        }
+            final SchemaDescriptor[] descriptors = new LabelSchemaDescriptor[rules.length];
 
-        Visitor<NodeUpdates, IOException> propertyUpdateVisitor = updates ->
-        {
-            // Do a lookup from which property has changed to a list of indexes worried about that property.
-            // We do not need to load additional properties as the NodeUpdates for a full node store scan already
-            // include all properties for the node.
-            for ( IndexEntryUpdate<IndexPopulatorWithSchema> indexUpdate : updates.forIndexKeys( populators ) )
+            for ( int i = 0; i < rules.length; i++ )
             {
-                try
-                {
-                    indexUpdate.indexKey().add( indexUpdate );
-                }
-                catch ( IndexEntryConflictException conflict )
+                IndexRule rule = rules[i];
+                SchemaIndexDescriptor index = rule.getIndexDescriptor();
+                descriptors[i] = index.schema();
+                IndexPopulator populator = schemaIndexProviders.lookup( rule.getProviderDescriptor() )
+                        .getPopulator( rule.getId(), index, new IndexSamplingConfig( config ) );
+                populator.create();
+                populators.add( new IndexPopulatorWithSchema( populator, index ) );
+            }
+
+            Visitor<NodeUpdates,IOException> propertyUpdateVisitor = updates ->
+            {
+                // Do a lookup from which property has changed to a list of indexes worried about that property.
+                // We do not need to load additional properties as the NodeUpdates for a full node store scan already
+                // include all properties for the node.
+                for ( IndexEntryUpdate<IndexPopulatorWithSchema> indexUpdate : updates.forIndexKeys( populators ) )
                 {
-                    throw conflict.notAllowed( indexUpdate.indexKey().index() );
+                    try
+                    {
+                        indexUpdate.indexKey().add( indexUpdate );
+                    }
+                    catch ( IndexEntryConflictException conflict )
+                    {
+                        throw conflict.notAllowed( indexUpdate.indexKey().index() );
+                    }
                 }
-            }
-            return true;
-        };
+                return true;
+            };
 
-        List<SchemaDescriptor> descriptorList = Arrays.asList( descriptors );
-        int[] labelIds = descriptorList.stream()
-                .mapToInt( SchemaDescriptor::keyId )
-                .toArray();
+            List<SchemaDescriptor> descriptorList = Arrays.asList( descriptors );
+            int[] labelIds = descriptorList.stream()
+                    .mapToInt( SchemaDescriptor::keyId )
+                    .toArray();
 
-        int[] propertyKeyIds = descriptorList.stream()
-                .flatMapToInt( d -> Arrays.stream( d.getPropertyIds() ) )
-                .toArray();
+            int[] propertyKeyIds = descriptorList.stream()
+                    .flatMapToInt( d -> Arrays.stream( d.getPropertyIds() ) )
+                    .toArray();
 
-        try ( InitialNodeLabelCreationVisitor labelUpdateVisitor = new InitialNodeLabelCreationVisitor() )
-        {
-            StoreScan<IOException> storeScan = indexStoreView.visitNodes( labelIds,
-                    propertyKeyId -> PrimitiveIntCollections.contains( propertyKeyIds, propertyKeyId ),
-                    propertyUpdateVisitor, labelUpdateVisitor, true );
-            storeScan.run();
+            try ( InitialNodeLabelCreationVisitor labelUpdateVisitor = new InitialNodeLabelCreationVisitor() )
+            {
+                StoreScan<IOException> storeScan = indexStoreView.visitNodes( labelIds,
+                        propertyKeyId -> PrimitiveIntCollections.contains( propertyKeyIds, propertyKeyId ),
+                        propertyUpdateVisitor, labelUpdateVisitor, true );
+                storeScan.run();
 
+                for ( IndexPopulatorWithSchema populator : populators )
+                {
+                    populator.verifyDeferredConstraints( indexStoreView );
+                    populator.setPopulationCompletedSuccessfully( true );
+                }
+            }
+        }
+        finally
+        {
+            Throwable throwable = null;
             for ( IndexPopulatorWithSchema populator : populators )
             {
-                populator.verifyDeferredConstraints( indexStoreView );
-                populator.close( true );
+                try
+                {
+                    populator.close();
+                }
+                catch ( Throwable t )
+                {
+                    throwable = Exceptions.chain( throwable, t );
+                }
+                if ( throwable != null )
+                {
+                    throw new RuntimeException( throwable );
+                }
             }
         }
     }
@@ -1308,6 +1330,7 @@ private static class IndexPopulatorWithSchema extends IndexPopulator.Adapter imp
         private final IndexPopulator populator;
         private final SchemaIndexDescriptor index;
         private Collection<IndexEntryUpdate<?>> batchedUpdates = new ArrayList<>( batchSize );
+        private boolean populationCompletedSuccessfully;
 
         IndexPopulatorWithSchema( IndexPopulator populator, SchemaIndexDescriptor index )
         {
@@ -1344,6 +1367,16 @@ public void verifyDeferredConstraints( PropertyAccessor propertyAccessor )
             populator.verifyDeferredConstraints( propertyAccessor );
         }
 
+        void setPopulationCompletedSuccessfully( boolean value )
+        {
+            this.populationCompletedSuccessfully = value;
+        }
+
+        void close() throws IOException
+        {
+            close( populationCompletedSuccessfully );
+        }
+
         @Override
         public void close( boolean populationCompletedSuccessfully ) throws IOException
         {