GH-2 Added a few more checks