fix NPE due to changes in handling of offline