diff --git a/server/server.go b/server/server.go
index 114a3bf46d..1bc679ccd7 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1195,7 +1195,12 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, localName
 
 	repoData, err := r.GetRepositoryData(remoteName)
 	if err != nil {
-		return err
+		if strings.Contains(err.Error(), "HTTP code: 404") {
+			return fmt.Errorf("Error: image %s not found", remoteName)
+		} else {
+			// Unexpected HTTP error
+			return err
+		}
 	}
 
 	utils.Debugf("Retrieving the tag list")