Change exception message
Add specs