Add some checking to the signature verification