diff --git a/storage/layers.go b/storage/layers.go
index 34d27ffa33..9cfe22e1d9 100644
--- a/storage/layers.go
+++ b/storage/layers.go
@@ -813,88 +813,86 @@ func (r *layerStore) Put(id string, parentLayer *Layer, names []string, mountLab
 			return nil, -1, err
 		}
 	}
-	if err == nil {
-		layer = &Layer{
-			ID:                 id,
-			Parent:             parent,
-			Names:              names,
-			MountLabel:         mountLabel,
-			Metadata:           templateMetadata,
-			Created:            time.Now().UTC(),
-			CompressedDigest:   templateCompressedDigest,
-			CompressedSize:     templateCompressedSize,
-			UncompressedDigest: templateUncompressedDigest,
-			UncompressedSize:   templateUncompressedSize,
-			CompressionType:    templateCompressionType,
-			UIDs:               templateUIDs,
-			GIDs:               templateGIDs,
-			Flags:              make(map[string]interface{}),
-			UIDMap:             copyIDMap(moreOptions.UIDMap),
-			GIDMap:             copyIDMap(moreOptions.GIDMap),
-			BigDataNames:       []string{},
-		}
-		r.layers = append(r.layers, layer)
-		r.idindex.Add(id)
-		r.byid[id] = layer
-		for _, name := range names {
-			r.byname[name] = layer
-		}
-		for flag, value := range flags {
-			layer.Flags[flag] = value
-		}
-		savedIncompleteLayer := false
-		if diff != nil {
-			layer.Flags[incompleteFlag] = true
-			err = r.Save()
-			if err != nil {
-				// We don't have a record of this layer, but at least
-				// try to clean it up underneath us.
-				if err2 := r.driver.Remove(id); err2 != nil {
-					logrus.Errorf("While recovering from a failure saving incomplete layer metadata, error deleting layer %#v: %v", id, err2)
-				}
-				return nil, -1, err
-			}
-			savedIncompleteLayer = true
-			size, err = r.applyDiffWithOptions(layer.ID, moreOptions, diff)
-			if err != nil {
-				if err2 := r.Delete(layer.ID); err2 != nil {
-					// Either a driver error or an error saving.
-					// We now have a layer that's been marked for
-					// deletion but which we failed to remove.
-					logrus.Errorf("While recovering from a failure applying layer diff, error deleting layer %#v: %v", layer.ID, err2)
-				}
-				return nil, -1, err
-			}
-			delete(layer.Flags, incompleteFlag)
-		} else {
-			// applyDiffWithOptions in the `diff != nil` case handles this bit for us
-			if layer.CompressedDigest != "" {
-				r.bycompressedsum[layer.CompressedDigest] = append(r.bycompressedsum[layer.CompressedDigest], layer.ID)
-			}
-			if layer.UncompressedDigest != "" {
-				r.byuncompressedsum[layer.UncompressedDigest] = append(r.byuncompressedsum[layer.UncompressedDigest], layer.ID)
-			}
-		}
+	layer = &Layer{
+		ID:                 id,
+		Parent:             parent,
+		Names:              names,
+		MountLabel:         mountLabel,
+		Metadata:           templateMetadata,
+		Created:            time.Now().UTC(),
+		CompressedDigest:   templateCompressedDigest,
+		CompressedSize:     templateCompressedSize,
+		UncompressedDigest: templateUncompressedDigest,
+		UncompressedSize:   templateUncompressedSize,
+		CompressionType:    templateCompressionType,
+		UIDs:               templateUIDs,
+		GIDs:               templateGIDs,
+		Flags:              make(map[string]interface{}),
+		UIDMap:             copyIDMap(moreOptions.UIDMap),
+		GIDMap:             copyIDMap(moreOptions.GIDMap),
+		BigDataNames:       []string{},
+	}
+	r.layers = append(r.layers, layer)
+	r.idindex.Add(id)
+	r.byid[id] = layer
+	for _, name := range names {
+		r.byname[name] = layer
+	}
+	for flag, value := range flags {
+		layer.Flags[flag] = value
+	}
+	savedIncompleteLayer := false
+	if diff != nil {
+		layer.Flags[incompleteFlag] = true
 		err = r.Save()
 		if err != nil {
-			if savedIncompleteLayer {
-				if err2 := r.Delete(layer.ID); err2 != nil {
-					// Either a driver error or an error saving.
-					// We now have a layer that's been marked for
-					// deletion but which we failed to remove.
-					logrus.Errorf("While recovering from a failure saving finished layer metadata, error deleting layer %#v: %v", layer.ID, err2)
-				}
-			} else {
-				// We don't have a record of this layer, but at least
-				// try to clean it up underneath us.
-				if err2 := r.driver.Remove(id); err2 != nil {
-					logrus.Errorf("While recovering from a failure saving finished layer metadata, error deleting layer %#v in graph driver: %v", id, err2)
-				}
+			// We don't have a record of this layer, but at least
+			// try to clean it up underneath us.
+			if err2 := r.driver.Remove(id); err2 != nil {
+				logrus.Errorf("While recovering from a failure saving incomplete layer metadata, error deleting layer %#v: %v", id, err2)
 			}
 			return nil, -1, err
 		}
-		layer = copyLayer(layer)
+		savedIncompleteLayer = true
+		size, err = r.applyDiffWithOptions(layer.ID, moreOptions, diff)
+		if err != nil {
+			if err2 := r.Delete(layer.ID); err2 != nil {
+				// Either a driver error or an error saving.
+				// We now have a layer that's been marked for
+				// deletion but which we failed to remove.
+				logrus.Errorf("While recovering from a failure applying layer diff, error deleting layer %#v: %v", layer.ID, err2)
+			}
+			return nil, -1, err
+		}
+		delete(layer.Flags, incompleteFlag)
+	} else {
+		// applyDiffWithOptions in the `diff != nil` case handles this bit for us
+		if layer.CompressedDigest != "" {
+			r.bycompressedsum[layer.CompressedDigest] = append(r.bycompressedsum[layer.CompressedDigest], layer.ID)
+		}
+		if layer.UncompressedDigest != "" {
+			r.byuncompressedsum[layer.UncompressedDigest] = append(r.byuncompressedsum[layer.UncompressedDigest], layer.ID)
+		}
 	}
+	err = r.Save()
+	if err != nil {
+		if savedIncompleteLayer {
+			if err2 := r.Delete(layer.ID); err2 != nil {
+				// Either a driver error or an error saving.
+				// We now have a layer that's been marked for
+				// deletion but which we failed to remove.
+				logrus.Errorf("While recovering from a failure saving finished layer metadata, error deleting layer %#v: %v", layer.ID, err2)
+			}
+		} else {
+			// We don't have a record of this layer, but at least
+			// try to clean it up underneath us.
+			if err2 := r.driver.Remove(id); err2 != nil {
+				logrus.Errorf("While recovering from a failure saving finished layer metadata, error deleting layer %#v in graph driver: %v", id, err2)
+			}
+		}
+		return nil, -1, err
+	}
+	layer = copyLayer(layer)
 	return layer, size, err
 }