Fix NPE with zk datastore access