CLOUDIFY-1592 avoid potentaial NPE