Handle errors more gracefully, adjust partition mapping.