Hack to prevent duplicate throw statements
Merge branch 'feature/dupe_throws'