Fix for NSNull with default values

@tgoyne