Exception fixes
Presenter docblock fixes