Do not fail when group is null and no attempts left to retry

Merged Sebastian requested to merge check-group-for-null into master

Merge request reports