diff --git a/templates/error/descriptions/E0001.md b/templates/error/descriptions/E0001.md
index 6831798bc..95d394833 100644
--- a/templates/error/descriptions/E0001.md
+++ b/templates/error/descriptions/E0001.md
@@ -1,4 +1,4 @@
-### Requests to `{{ path }}` are not supported
+# Requests to `{{ path }}` are not supported
 The Community Solid Server received a request for `{{ path }}`, which is not configured.
 Here are some things you can try to fix this:
  - Have you started the server with the right hostname?
diff --git a/templates/error/main.md b/templates/error/main.md
index 3e30f35f3..54e946416 100644
--- a/templates/error/main.md
+++ b/templates/error/main.md
@@ -1,11 +1,15 @@
-# {{ name }}
-
 {{#if description}}
 {{{ description }}}
+{{else}}
+# {{ name }}
 {{/if}}
 
 ## Technical details
+{{#if message}}
 {{ message }}
+{{else}}
+_No further details available._
+{{/if}}
 
 {{#if stack}}
 ```