Add one more check for empty organization

'Organization' is passed empty when no value was specified, so its length
has to be checked