Added some simple checks