FIX: Invalid Exception throw results in CI failures
Merge pull request #33 from madmatt/pulls/fix-exceptions

FIX: Invalid Exception throw results in CI failures