CLOUDIFY-1595 fix NPE