diff --git a/rhodecode/lib/vcs/client_http.py b/rhodecode/lib/vcs/client_http.py
--- a/rhodecode/lib/vcs/client_http.py
+++ b/rhodecode/lib/vcs/client_http.py
@@ -237,6 +237,8 @@ def _remote_call(url, payload, exception
 
         try:
             exc._vcs_server_traceback = error['traceback']
+            exc._vcs_server_org_exc_name = error['org_exc']
+            exc._vcs_server_org_exc_tb = error['org_exc_tb']
         except KeyError:
             pass
 
@@ -249,8 +251,6 @@ class VcsHttpProxy(object):
     CHUNK_SIZE = 16384
 
     def __init__(self, server_and_port, backend_endpoint):
-
-
         retries = Retry(total=5, connect=None, read=None, redirect=None)
 
         adapter = requests.adapters.HTTPAdapter(max_retries=retries)
diff --git a/rhodecode/lib/vcs/exceptions.py b/rhodecode/lib/vcs/exceptions.py
--- a/rhodecode/lib/vcs/exceptions.py
+++ b/rhodecode/lib/vcs/exceptions.py
@@ -24,6 +24,7 @@ Custom vcs exceptions module.
 import logging
 import functools
 import urllib2
+import rhodecode
 
 log = logging.getLogger(__name__)
 
@@ -180,17 +181,26 @@ def map_vcs_exceptions(func):
         try:
             return func(*args, **kwargs)
         except Exception as e:
+            from rhodecode.lib.utils2 import str2bool
+            debug = str2bool(rhodecode.CONFIG.get('debug'))
+
             # The error middleware adds information if it finds
             # __traceback_info__ in a frame object. This way the remote
             # traceback information is made available in error reports.
             remote_tb = getattr(e, '_vcs_server_traceback', None)
+            org_remote_tb = getattr(e, '_vcs_server_org_exc_tb', '')
             __traceback_info__ = None
             if remote_tb:
                 if isinstance(remote_tb, basestring):
                     remote_tb = [remote_tb]
                 __traceback_info__ = (
-                    'Found VCSServer remote traceback information:\n\n' +
-                    '\n'.join(remote_tb))
+                    'Found VCSServer remote traceback information:\n'
+                    '{}\n'
+                    '+++ BEG SOURCE EXCEPTION +++\n\n'
+                    '{}\n'
+                    '+++ END SOURCE EXCEPTION +++\n'
+                    ''.format('\n'.join(remote_tb), org_remote_tb)
+                )
 
                 # Avoid that remote_tb also appears in the frame
                 del remote_tb
@@ -205,9 +215,9 @@ def map_vcs_exceptions(func):
                     args = e.args
                 else:
                     args = [__traceback_info__ or 'unhandledException']
-                if __traceback_info__ and kind not in ['unhandled', 'lookup']:
+                if debug or __traceback_info__ and kind not in ['unhandled', 'lookup']:
                     # for other than unhandled errors also log the traceback
-                    # can be usefull for debugging
+                    # can be useful for debugging
                     log.error(__traceback_info__)
                 raise _EXCEPTION_MAP[kind](*args)
             else: