Improve error messages in cluster verify/OS