Make error message more accurate