Make exception message consistent