Improved handing of bad hypervisors.