Minor: fixed some NPE discovered when running in distributed cfg