CLOUDIFY-2532 added more validations...