Add basic state checking in FacetSupport