Added error checking/reporting around get_disk