Add some more checks to gen-subkey