Fix on error to return in arrange stage