Fix for NSNull with default values

@tgoyne 

Addresses #928