Replace any returned instance of NSNull with nil.

To prevent the inevitable crash caused by NSNull getting sent a message.