Code: Rescue from throwing. (#362)
Merge pull request #367 from am11/issue-362

Code: Rescue from throwing (#362)