Modernize objective-c and bug where a dictionary potentially could insert a nil value.