diff --git a/python/helpers/pydev/pydevd_breakpoints.py b/python/helpers/pydev/pydevd_breakpoints.py
index 27d7ec91e42a..1c7ee4c87ffe 100644
--- a/python/helpers/pydev/pydevd_breakpoints.py
+++ b/python/helpers/pydev/pydevd_breakpoints.py
@@ -146,8 +146,8 @@ def restore_pm_excepthook():
 
 
 def update_exception_hook(dbg):
-    if len(dbg.exception_set) >0:
-        set_pm_excepthook(tuple(dbg.exception_set))
+    if dbg.exception_set:
+        set_pm_excepthook(dict(dbg.exception_set))
     else:
         restore_pm_excepthook()
 
diff --git a/python/helpers/pydev/pydevd_comm.py b/python/helpers/pydev/pydevd_comm.py
index 281f27cbf04c..0aef5856aa73 100644
--- a/python/helpers/pydev/pydevd_comm.py
+++ b/python/helpers/pydev/pydevd_comm.py
@@ -775,10 +775,13 @@ class InternalGetCompletions(InternalThreadCommand):
             try:
                 import console._completer
             except:
-                path = os.environ['PYDEV_COMPLETER_PYTHONPATH']
-                sys.path.append(path)
-                remove_path = path
-                import console._completer
+                try:
+                    path = os.environ['PYDEV_COMPLETER_PYTHONPATH']
+                    sys.path.append(path)
+                    remove_path = path
+                    import console._completer
+                except :
+                    traceback.print_exc()
             
             try: