Don't crash when testing with Thor. Fixes #146
Merge pull request #167 from stevegraham/bugfix/thor-crash

Don't crash when testing with Thor. Fixes #146