LYFT-14491 - resolve issue with adding null group to context