Fix Errors on throw

Sorry about the last push this one is comprehensive