Fixing exception wrapping in Indexer