diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 662c749..4cf4bf8 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -33,3 +33,4 @@
 - [Jeffrey Carpenter](https://uvolabs.me)
 - [Paul Lettington](https://github.com/plett)
 - [Thomas Vochten](https://github.com/thomasvochten)
+- [Caspar Krieger](https://www.asparck.com)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 9184fe8..d20ef16 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -12,10 +12,14 @@
     {{ template "_internal/twitter_cards.html" . }}
     {{ template "_internal/opengraph.html" . }}
 
-    <base href="{{ .Permalink }}">
+    {{ if .Permalink }}
+      <base href="{{ .Permalink }}">
+    {{ end }}
     <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
 
-    <link rel="canonical" href="{{ .Permalink }}">
+    {{ if .Permalink }}
+      <link rel="canonical" href="{{ .Permalink }}">
+    {{ end }}
 
     <link href="https://fonts.googleapis.com/css?family=Lato:400,700%7CMerriweather:300,700%7CSource+Code+Pro:400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous" />