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

kyledewey/stp,kyledewey/stp,kyledewey/stp,kyledewey/stp,kyledewey/stp,kyledewey/stp