Fix NSNull properties being set to nil