add some missing sanity checks