ENG-4213: Hofix for hotfix for NPE in our client.