diff --git a/IPython/completer.py b/IPython/completer.py
index 0b9c57b..96bee03 100644
--- a/IPython/completer.py
+++ b/IPython/completer.py
@@ -201,7 +201,11 @@ class Completer:
         try:
             object = eval(expr, self.namespace)
         except:
-            object = eval(expr, self.global_namespace)
+            try:
+                object = eval(expr, self.global_namespace)
+            except:
+                return []
+                
 
         # Start building the attribute list via dir(), and then complete it
         # with a few extra special-purpose calls.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a77631a..724178a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Ville Vainio  <vivainio@gmail.com>
+
+	* completer.py (attr_matches): catch all exceptions raised 
+	by eval of expr with dots.
+
 2006-11-07  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/iplib.py (runsource): Prepend an 'if 1:' to the user