diff --git a/changelog/unreleased/hardening-type-assertion.md b/changelog/unreleased/hardening-type-assertion.md
new file mode 100644
index 0000000000..1cd31f6d3b
--- /dev/null
+++ b/changelog/unreleased/hardening-type-assertion.md
@@ -0,0 +1,6 @@
+Bugfix: Fix runtime error when type asserting on nil value
+
+Fixed the case where an account UUID present in the context is nil, and type asserting it as a string would produce a runtime error.
+
+https://github.com/owncloud/ocis-settings/pull/38
+https://github.com/owncloud/ocis-settings/issues/37