diff --git a/app/controllers/not-found-error.js b/app/controllers/not-found-error.js
index 5b40c31f..cf1af46d 100644
--- a/app/controllers/not-found-error.js
+++ b/app/controllers/not-found-error.js
@@ -1,13 +1,12 @@
 /* eslint-disable ember/no-get */
 import Controller from '@ember/controller';
-import { get } from '@ember/object';
 
 export default class NotFoundErrorController extends Controller {
   get icon() {
-    return `${get(this, 'model.config.branding.error.icon')}`;
+    return this.model.config.branding.error?.icon;
   }
 
   get contactUrl() {
-    return `${get(this, 'model.config.branding.pages.contactUrl')}`;
+    return this.model.config.branding.pages?.contactUrl;
   }
 }
diff --git a/app/templates/not-found-error.hbs b/app/templates/not-found-error.hbs
index 5bef13a5..0175ab8f 100644
--- a/app/templates/not-found-error.hbs
+++ b/app/templates/not-found-error.hbs
@@ -1,10 +1,17 @@
 {{outlet}}
 <div class="row">
-  <div class="col">
-    <img src="{{this.icon}}" local-class="error-icon" alt="Error icon" />
-    <p local-class="error-text"><br />404: Page not found</p>
+  <div class="col-2">
+    <img src="{{this.icon}}" alt="Error icon" />
+  </div>
+  <div class="col my-auto">
+    <h2>404: Page not found</h1>
     <p local-class="helpful-text">Looks like the page you're looking for does not exist. If you think there is a problem
       with the site, please
-      <a href="{{this.contactUrl}}">let us know</a>.</p>
+      {{#if this.contactUrl}}
+        <a href="{{this.contactUrl}}">let us know</a>.
+      {{else}}
+        contact your administrator.
+      {{/if}}
+    </p>
   </div>
 </div>
\ No newline at end of file