LPS-44908 Method must return the map, not null

Pushed to upstream