diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py
--- a/rhodecode/lib/vcs/backends/git/repository.py
+++ b/rhodecode/lib/vcs/backends/git/repository.py
@@ -268,7 +268,7 @@ class GitRepository(BaseRepository):
                 revision = self.revisions[int(revision)]
             except:
                 raise ChangesetDoesNotExistError("Revision %r does not exist "
-                    "for this repository %s" % (revision, self))
+                    "for this repository" % (revision))
 
         elif is_bstr(revision):
             # get by branch/tag name
@@ -283,7 +283,7 @@ class GitRepository(BaseRepository):
 
             elif not pattern.match(revision) or revision not in self.revisions:
                 raise ChangesetDoesNotExistError("Revision %r does not exist "
-                    "for this repository %s" % (revision, self))
+                    "for this repository" % (revision))
 
         # Ensure we return full id
         if not pattern.match(str(revision)):
diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py
--- a/rhodecode/lib/vcs/backends/hg/repository.py
+++ b/rhodecode/lib/vcs/backends/hg/repository.py
@@ -405,8 +405,8 @@ class MercurialRepository(BaseRepository
             revision = hex(self._repo.lookup(revision))
         except (IndexError, ValueError, RepoLookupError, TypeError):
             raise ChangesetDoesNotExistError("Revision %r does not "
-                                    "exist for this repository %s" \
-                                    % (revision, self))
+                                    "exist for this repository"
+                                    % (revision))
         return revision
 
     def _get_archives(self, archive_name='tip'):
diff --git a/rhodecode/tests/functional/test_files.py b/rhodecode/tests/functional/test_files.py
--- a/rhodecode/tests/functional/test_files.py
+++ b/rhodecode/tests/functional/test_files.py
@@ -294,8 +294,7 @@ removed extra unicode conversion in diff
         msg = """Revision %r does not exist for this repository""" % (rev)
         self.checkSessionFlash(response, msg)
 
-        msg = """%s""" % (HG_REPO)
-        self.checkSessionFlash(response, msg)
+        self.assertEqual('http://localhost/%s/files/tip/' % HG_REPO, response.headers['location'])
 
     def test_raw_file_wrong_f_path(self):
         self.log_user()
@@ -333,8 +332,7 @@ removed extra unicode conversion in diff
         msg = """Revision %r does not exist for this repository""" % (rev)
         self.checkSessionFlash(response, msg)
 
-        msg = """%s""" % (HG_REPO)
-        self.checkSessionFlash(response, msg)
+        self.assertEqual('http://localhost/%s/files/tip/' % HG_REPO, response.headers['location'])
 
     def test_raw_wrong_f_path(self):
         self.log_user()