Moved exception handlers into own namespace