Fixed bug where deferred's resolve was being thrown away in error scenarios causing indexer hang

Fixed bug where deferred's resolve was being thrown away in error scenarios causing indexer hang #4130