Return when we enter the next handler.

Return when we enter the next handler. #6893