diff --git a/AUTHORS b/AUTHORS
index b49405bf757..c55be41e3c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -147,3 +147,4 @@ Victor Uriarte
 Vidar T. Fauske
 Wouter van Ackooy
 Xuecong Liao
+Omer Hadari
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 32726274f4e..de3f334c29e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -22,7 +22,8 @@
 * Replace ``raise StopIteration`` usages in the code by simple ``returns`` to finish generators, in accordance to `PEP-479`_ (`#2160`_).
   Thanks `@tgoodlet`_ for the report and `@nicoddemus`_ for the PR.
   
-*  
+* Fix internal errors when an unprintable ``AssertionError`` is raised inside a test.
+  Thanks `@omerhadari`_ for the PR.
 
 * Skipping plugin now also works with test items generated by custom collectors (`#2231`_).
   Thanks to `@vidartf`_.