Tighten modal error checking