#125 - Exceptions made more informative