Change exception logic