Added some prechecks