diff --git a/src/Controller/GuiController.php b/src/Controller/GuiController.php
index 395b863..418e071 100644
--- a/src/Controller/GuiController.php
+++ b/src/Controller/GuiController.php
@@ -44,6 +44,7 @@ class GuiController extends AbstractController {
             'title' => 'Joe Carstairs\' notes',
             'description' => 'Joe Carstairs\' notes',
             'note' => $note,
+            'slug' => $slug,
         ];
     }
 
@@ -74,7 +75,7 @@ class GuiController extends AbstractController {
             $entityManager->persist($note);
             $entityManager->flush();
 
-            return $this->redirectToRoute('note', ['slug' => $note->getSlug()]);
+            return $this->redirectToRoute('note', ['slug' => $slug]);
         }
 
         return $this->render('/write_note.html.twig', [
diff --git a/templates/note.html.twig b/templates/note.html.twig
index 4cc29a3..0a47292 100644
--- a/templates/note.html.twig
+++ b/templates/note.html.twig
@@ -1,9 +1,17 @@
 {% extends 'base.html.twig' %}
 
 {% block content %}
-    <section>
-        <h1>Note</h1>
-        <time>{{ note.getPublishedDate().format('c') }}
-        <p>{{ note.content }}</p>
-    </section>
+    {% if note %}
+        <section>
+            <h1>Note {{ note.slug }}</h1>
+            <time>{{ note.publishedDate.format('c') }}
+            <p>{{ note.content }}</p>
+        </section>
+    {% else %}
+        <section>
+            <h1>Note not found</h1>
+            <p>I don't have a note '{{ slug }}'.</p>
+            <p>Go back to <a href="/notes">Notes</a>.</p>
+        </section>
+    {% endif %}
 {% endblock %}