improved the handling of certain partition errors