WL-2599 Also update MappedGroupsResource with exceptions.

Tidying up my mess from the first commit.