Closes #816 Fixed exception message per recommendation. Also updated expiration message to be clearer/intuitive.