NETVIRT-1643: Added checkes to resolve NPE