diff --git a/subcmds/upload.py b/subcmds/upload.py
index 50dccc52..a23755c7 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -520,10 +520,10 @@ Gerrit Code Review:  https://www.gerritcodereview.com/
           avail = [up_branch]
         else:
           avail = None
-          print('repo: error: Unable to upload branch "%s". '
+          print('repo: error: %s: Unable to upload branch "%s". '
                 'You might be able to fix the branch by running:\n'
                 '  git branch --set-upstream-to m/%s' %
-                (str(cbr), self.manifest.branch),
+                (project.relpath, str(cbr), self.manifest.branch),
                 file=sys.stderr)
       else:
         avail = project.GetUploadableBranches(branch)