CLOUD-1000 fix NPE