Merge pull request #1082 from scunz/fixDoubleDeleteOnError Indexer: Avoid a possible double-deletion in error case