Restored exception handler