Fix organization 'None' issue.