Just .pop(..., None) from dicts to avoid exceptions