Make errors more consistent