Added check for indexer failures
Merge remote-tracking branch 'origin/master'