diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47c1007372b..933e470b308 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,19 @@ ownCloud admins and users.
 Summary
 -------
 
+* Bugfix - Null pointer exception have been avoided: [#4158](https://github.com/owncloud/android/issues/4158)
 * Enhancement - "Apply to all" when many name conflicts arise: [#4078](https://github.com/owncloud/android/issues/4078)
 
 Details
 -------
 
+* Bugfix - Null pointer exception have been avoided: [#4158](https://github.com/owncloud/android/issues/4158)
+
+   In the detail screen as elsewhere the app has been prevented from crashing when a null is found.
+
+   https://github.com/owncloud/android/issues/4158
+   https://github.com/owncloud/android/pull/4170
+
 * Enhancement - "Apply to all" when many name conflicts arise: [#4078](https://github.com/owncloud/android/issues/4078)
 
    A new dialog has been created where a checkbox has been added to be able to select all the folders