CLOUDIFY-1832 fixed the errors.