Adding exceptions for empty trigger.group