diff --git a/python/helpers/pydev/_pydev_imps/_pydev_saved_modules.py b/python/helpers/pydev/_pydev_imps/_pydev_saved_modules.py
index 35dc0a6a9768..16fe21bd25db 100644
--- a/python/helpers/pydev/_pydev_imps/_pydev_saved_modules.py
+++ b/python/helpers/pydev/_pydev_imps/_pydev_saved_modules.py
@@ -1,8 +1,13 @@
+import sys
+IS_PY2 = True
+if sys.version_info[0] >= 3:
+    IS_PY2 = False
+
 import threading
 
-try:
+if IS_PY2:
     import thread
-except:
+else:
     import _thread as thread
 
 import time
@@ -11,22 +16,22 @@ import socket
 
 import select
 
-try:
+if IS_PY2:
     import Queue as _queue
-except:
+else:
     import queue as _queue
 
-try:
+if IS_PY2:
     import xmlrpclib
-except:
+else:
     import xmlrpc.client as xmlrpclib
 
-try:
+if IS_PY2:
     import SimpleXMLRPCServer as _pydev_SimpleXMLRPCServer
-except:
+else:
     import xmlrpc.server as _pydev_SimpleXMLRPCServer
 
-try:
+if IS_PY2:
     import BaseHTTPServer
-except:
+else:
     import http.server as BaseHTTPServer
\ No newline at end of file
diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py
index a7794b19bf3b..50d1b971a469 100644
--- a/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py
+++ b/python/helpers/pydev/_pydevd_bundle/pydevd_constants.py
@@ -118,6 +118,7 @@ def protect_libraries_from_patching():
     for name in patched_modules:
         del sys.modules[name]
 
+    # import for side effects
     import _pydev_imps._pydev_saved_modules
 
     for name in patched_modules: