CLOUDIFY-1608 fix NPE