A bit more checking for empty values.