Fixed static analyzer warning

The analyzer was complaining that it would be possible to assign nil to a mutable dictionary.
Merge pull request #1801 from philippec/master

Fixed static analyzer warning