diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index daa1aa0a..d5a20f3d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+1.7.1
+=====
+
+* Fixed regression which caused ``TypeErrors`` when trying to set annotations due to PR #87
+
+
 1.7.0
 =====
 
diff --git a/sphinx_autodoc_typehints.py b/sphinx_autodoc_typehints.py
index e863f420..3a7dffab 100644
--- a/sphinx_autodoc_typehints.py
+++ b/sphinx_autodoc_typehints.py
@@ -206,7 +206,7 @@ def get_all_type_hints(obj, name):
 
     try:
         obj.__annotations__ = rv
-    except AttributeError:
+    except (AttributeError, TypeError):
         return rv
 
     try: