Merge "Fix KeyError in show_stopper checking"