Fix issue where missing keys cause stack traces #3