diff --git a/git-remote-hg b/git-remote-hg
index 677ae20..13b80d1 100755
--- a/git-remote-hg
+++ b/git-remote-hg
@@ -53,6 +53,8 @@ import time as ptime
 # Commits are modified to preserve hg information and allow bidirectionality.
 #
 
+DEBUG_REMOTEHG = os.environ.get("DEBUG_REMOTEHG") != None
+
 NAME_RE = re.compile('^([^<>]+)')
 AUTHOR_RE = re.compile('^([^<>]+?)? ?[<>]([^<>]*)(?:$|>)')
 EMAIL_RE = re.compile(r'([^ \t<>]+@[^ \t<>]+)')
@@ -426,10 +428,7 @@ def get_repo(url, alias):
             util.writefile(os.path.join(local_path, '.hg', 'sharedpath'), hg_path)
 
         repo = hg.repository(myui, local_path)
-        try:
-            peer = hg.peer(repo.ui, {}, url)
-        except:
-            die('Repository error')
+        peer = hg.peer(repo.ui, {}, url)
         repo.pull(peer, heads=None, force=True)
 
         updatebookmarks(repo, peer)
@@ -1322,4 +1321,10 @@ def bye():
         shutil.rmtree(dirname)
 
 atexit.register(bye)
-sys.exit(main(sys.argv))
+
+try:
+    sys.exit(main(sys.argv))
+except Exception, e:
+    if DEBUG_REMOTEHG:
+       raise
+    die(str(e))