Fixes for issues related to missing entities/groups. Enforeces 1 group == 1 handler contract.