Bug 1094024 - Handle hatchet errors better