removed conditional exec of next handler