Add handling with empty string