Adding more checks, one among them that fails cleanly on an STP bug