Added helpful error messages for missing keys.py
Merge remote-tracking branch 'github/master'