Fixed more potential issues with creating a NSDictionary with nil values