Fixed exception message and adjusted annotation