Cleanup and tweaks to make throw/catch better