GH-14 Add guard for empty values.