Added further sanity checks