diff --git a/clair/layering.go b/clair/layering.go
index f64e042..358df0e 100644
--- a/clair/layering.go
+++ b/clair/layering.go
@@ -61,7 +61,8 @@ func (layers *layering) pushAll() error {
 
 		//FIXME Update to TLS
 		if config.IsLocal {
-			payload.Layer.Path = strings.Replace(payload.Layer.Path, u.String(), layers.hURL, 1)
+			local := layers.hURL + "/" + layers.image.Hostname()
+			payload.Layer.Path = strings.Replace(payload.Layer.Path, u.String(), local, 1)
 			payload.Layer.Path += "/layer.tar"
 		}
 
diff --git a/docker/dockercli/dockercli.go b/docker/dockercli/dockercli.go
index 8b69dda..5e8a527 100644
--- a/docker/dockercli/dockercli.go
+++ b/docker/dockercli/dockercli.go
@@ -114,6 +114,7 @@ func save(imageName string) (distribution.Manifest, error) {
 	}()
 
 	if err != nil {
+		log.Error(err)
 		return nil, err
 	}
 
@@ -123,11 +124,13 @@ func save(imageName string) (distribution.Manifest, error) {
 
 	err = openAndUntar(path+"/output.tar", path)
 	if err != nil {
+		log.Error(err)
 		return nil, err
 	}
 
 	err = os.Remove(path + "/output.tar")
 	if err != nil {
+		log.Error(err)
 		return nil, err
 	}
 	return historyFromManifest(path)