Index: django/template/defaultfilters.py
===================================================================
--- django/template/defaultfilters.py	(revision 5030)
+++ django/template/defaultfilters.py	(working copy)
@@ -321,7 +321,7 @@
     "Joins a list with a string, like Python's ``str.join(list)``"
     try:
         return arg.join(map(smart_string, value))
-    except AttributeError: # fail silently but nicely
+    except AttributeError, TypeError: # fail silently but nicely
         return value
 
 def length(value):