[PATCH 2/3] Improve error messages when validating disks