LEDGE-218: added missing null check