For C-8457, Got exiting the dispatch loop wrong.