Add indexer exception handling