Improved handling of nil