More Exceptions

I'm still working out the finer details on getting the exceptions to
work, but you can see the framework and adjust your functions