Check fo duplicate/missing keys
Merge pull request #1290 from erwinwinder/master

Check fo duplicate/missing keys