CLOUDIFY-1423, added null check