Exception handler is included and tested... Seems to work