diff --git a/cmd/cli/load.go b/cmd/cli/load.go
index 618a4e609f6f98ef4199f96beb3f39512c15c6c7..f8b6c9bb4ffceb8fc15c85584889fb12a930dccf 100644
--- a/cmd/cli/load.go
+++ b/cmd/cli/load.go
@@ -80,15 +80,15 @@ func runLoad(ctx context.Context, cli Cli) error {
 
 	for {
 		msg, rerr := resp.Recv()
-		if msg != nil {
-			fmt.Print(msg.Log)
-		}
 		if rerr != nil {
 			if rerr != io.EOF {
-				err = rerr
+				return rerr
 			}
 			break
 		}
+		if msg != nil {
+			fmt.Print(msg.Log)
+		}
 	}
 
 	return err
diff --git a/cmd/cli/tag.go b/cmd/cli/tag.go
index 18f3e5ab11819712a4c836051341187a348684ba..614611c9f869966fd2194589dd6c65b4fbc5f54a 100644
--- a/cmd/cli/tag.go
+++ b/cmd/cli/tag.go
@@ -59,9 +59,6 @@ func runTag(ctx context.Context, cli Cli, args []string) error {
 		Image: args[0],
 		Tag:   args[1],
 	})
-	if err != nil {
-		return err
-	}
 
-	return nil
+	return err
 }
diff --git a/daemon/load.go b/daemon/load.go
index 8100e9a4e61634086e9e390fe9a8bd8c7acf4e5c..256da449d237b9c2a9104ab5b33b7b0b499cdfb4 100644
--- a/daemon/load.go
+++ b/daemon/load.go
@@ -51,7 +51,7 @@ func (b *Backend) Load(req *pb.LoadRequest, stream pb.Control_LoadServer) error
 
 	topLevelImageManifest, err := tarfileSource.LoadTarManifest()
 	if err != nil || len(topLevelImageManifest) == 0 {
-		return errors.Wrapf(err, "failed to get the top level image manifest")
+		return errors.Errorf("failed to get the top level image manifest: %v", err)
 	}
 
 	log := logger.NewCliLogger(constant.CliLogBufferLen)
@@ -90,7 +90,7 @@ func (b *Backend) Load(req *pb.LoadRequest, stream pb.Control_LoadServer) error
 	if werr := eg.Wait(); werr != nil {
 		return werr
 	}
-
 	logrus.Infof("Loaded image as %s", si.ID)
+
 	return nil
 }
diff --git a/util/common.go b/util/common.go
index 677760edd68471c713af8b9479cf829aecc6a09d..87d3cfc92361d1c0752d19cf7ca45eefd5aacb93 100644
--- a/util/common.go
+++ b/util/common.go
@@ -29,7 +29,7 @@ import (
 
 const (
 	maxServerNameLength = 255
-	maxLoadFileSize     = 10 * 1024 * 1024 * 1024
+	maxLoadFileSize     = 50 * 1024 * 1024 * 1024
 	decimalPrefixBase   = 1000
 )