Fixes/improvements to throwing