Adding some "no key" sanity checks, allowing for the key store dictionary to be plaintext, in theory.  In practice, it should always be encrypted.