Handle nil organization names

to resolve #95