Failing test for throwing errors
Fixes for thrown errors
Merge branch 'throw'