Merge pull request #419 from annando/bad-retriever