Properly handle unset values