Add sanity checks for wacky criteria returns