Minor mod on exception handler class