Add a little more information to some exceptions to help with #4