Make error messages for invalid machine names consistent