Halt extraction on invalid index
Merge branch 'hotfix/0.9.1'