Added basic sanity checks