Finally clean up that error message difference