Better VM failure handling