Take better care of nil values