- BZ-1036987: IE issue, adding null checks in the services