Check with empty() instead of equality to catch edge cases
Fix probable typo: Organiztion -> Organization
Merge remote-tracking branch 'origin/patch-1'