Added some hand checks