[#858] corrected comment typo
[#2222] Safer dereferencing of keyvals