Added key check (closes #388)
Merge pull request #401 from stefk/key-check

Added key check (closes #388)