diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go
index 4a4003943e..4daebf3ffc 100644
--- a/pkg/compute/models/guests.go
+++ b/pkg/compute/models/guests.go
@@ -2441,7 +2441,7 @@ func (self *SGuest) createDiskOnHost(ctx context.Context, userCred mcclient.Toke
 	diskConfig *SDiskConfig, pendingUsage quotas.IQuota, inheritBilling bool) (*SDisk, error) {
 	storage := self.GetDriver().ChooseHostStorage(host, diskConfig.Backend)
 	if storage == nil {
-		return nil, fmt.Errorf("No storage to create disk")
+		return nil, fmt.Errorf("No storage on %s to create disk for %s", host.GetName(), diskConfig.Backend)
 	}
 	disk, err := self.createDiskOnStorage(ctx, userCred, storage, diskConfig, pendingUsage, inheritBilling)
 	if err != nil {
diff --git a/pkg/compute/tasks/guest_rebuild_root_task.go b/pkg/compute/tasks/guest_rebuild_root_task.go
index b19ae818b5..627e52354f 100644
--- a/pkg/compute/tasks/guest_rebuild_root_task.go
+++ b/pkg/compute/tasks/guest_rebuild_root_task.go
@@ -106,10 +106,14 @@ func (self *GuestRebuildRootTask) OnRebuildingDataDisksComplete(ctx context.Cont
 }
 
 func (self *GuestRebuildRootTask) OnRebuildingDataDisksCompleteFailed(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
-	db.OpsLog.LogEvent(guest, db.ACT_REBUILD_ROOT_FAIL, data, self.UserCred)
-	guest.SetStatus(self.UserCred, models.VM_REBUILD_ROOT_FAIL, "OnRebuildingDataDisksCompleteFailed")
-	logclient.AddActionLog(guest, logclient.ACT_VM_REBUILD, data, self.UserCred, false)
-	self.SetStageFailed(ctx, data.String())
+	/*
+		XXX ignore rebuild data disk errors
+		db.OpsLog.LogEvent(guest, db.ACT_REBUILD_ROOT_FAIL, data, self.UserCred)
+		guest.SetStatus(self.UserCred, models.VM_REBUILD_ROOT_FAIL, "OnRebuildingDataDisksCompleteFailed")
+		logclient.AddActionLog(guest, logclient.ACT_VM_REBUILD, data, self.UserCred, false)
+		self.SetStageFailed(ctx, data.String())
+	*/
+	self.OnRebuildAllDisksComplete(ctx, guest, data)
 }
 
 func (self *GuestRebuildRootTask) OnRebuildAllDisksComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {