Add exceptional stop matching