2 files changed, 7 insertions, 1 deletions
diff --git a/release/scripts/modules/console/complete_calltip.py b/release/scripts/modules/console/complete_calltip.py
index c4687b4f10b..87fac9f4c07 100644
--- a/release/scripts/modules/console/complete_calltip.py
+++ b/release/scripts/modules/console/complete_calltip.py
@@ -124,7 +124,7 @@ def get_argspec(func, strip_self=True, doc=None, source=None):
         if source is None:
             try:
                 source = inspect.getsource(func)
-            except TypeError:
+            except (TypeError, IOError):
                 source = ''
         if source:
             match = re.search(DEF_SOURCE % func_name, source, RE_FLAG)
diff --git a/release/scripts/modules/console/complete_import.py b/release/scripts/modules/console/complete_import.py
index 875c557f497..4b50cf6deb8 100644
--- a/release/scripts/modules/console/complete_import.py
+++ b/release/scripts/modules/console/complete_import.py
@@ -32,6 +32,7 @@ changes have been made:
 - limit list of modules to prefix in case of "from w"
 - sorted modules
 - added sphinx documentation
+- complete() returns a blank list of the module isnt found
 """
 
 
@@ -183,3 +184,8 @@ def complete(line):
     if len(words) >= 3 and words[0] == 'from':
         mod = words[1]
         return filter_prefix(try_import(mod), words[-1])
+
+    # get here if the import is not found
+    # import invalidmodule
+    #                      ^, in this case return nothing
+    return []