Properly handle empty values.