Clean up error throw calls