[1030889] Added check for empty strings