router.svcnum nullability fix