Check for the existence of the key. Fixes #611.
Merge pull request #613 from s0undt3ch/issues/611

Check for the existence of the key. Fixes #611.