Issue #2379057 by chr.fritsch: Fix empty/not-empty handlers
Merge pull request #63 from VeggieMeat/empty-not-empty

Issue #2379057 by chr.fritsch: Fix empty/not-empty handlers