diff --git a/avocado/core/data_dir.py b/avocado/core/data_dir.py
index ed6b5ca1228ce2f2734598fb123980e8f5bf4dfc..1f2cb9a7cd6e8617d7b8aa1ffc1a4ce836f1b15e 100755
--- a/avocado/core/data_dir.py
+++ b/avocado/core/data_dir.py
@@ -231,7 +231,8 @@ class _TmpDirTracker(Borg):
             try:
                 if os.path.isdir(tmp_dir):
                     shutil.rmtree(tmp_dir)
-            except AttributeError:
+            # Need catch AttributeError and TypeError.
+            except (AttributeError, TypeError):
                 pass