Check with empty() instead of equality to catch edge cases
Merge branch 'use-empty'