GH-162: No 500 w/ better handle missing dict keys
Merge pull request #171 from msabramo/GH-162

GH-162: No 500 w/ better handle missing dict keys