Add NPE protection for VpnFootprintService.removeOrUpdate...