Improve error handling for disk preparation