Static Analysis: Fix nil dictionary key and value