Don't blindly assume check information is available

Fixes a `KeyError` exception.
Initialize as empty dict to avoid possible `TypeError`s
Cleanup: use `dict.update()`