Final changes

Change from offensive
Uncomment exception handler