EMM-734 : fixed issue which happens when the host url is null
Merge branch 'master' into develop