@@ -401,7 +401,9 @@ func restoreCustomImage(is image.Store, ls layer.Store, rs reference.Store) erro

 		id, err := is.Create(config)

 		if err != nil {

-			return err

+			logrus.Warnf("Failed to restore custom image %s with error: %s.", name, err.Error)

+			logrus.Warnf("Skipping image %s...", name)

+			continue

 		}

 		if err := rs.AddTag(ref, id, true); err != nil {

@@ -454,7 +454,7 @@ func (d *Driver) GetCustomImageInfos() ([]CustomImageInfo, error) {

 		imageData.ID = id

 		// For now, hard code that all base images except nanoserver depend on win32k support

-		if imageData.Name != "nanoserver" {

+		if imageData.Name != "NanoServer" {

 			imageData.OSFeatures = append(imageData.OSFeatures, "win32k")

 		}