CLOUDIFY-1335 added null check