Uncomment exception handling