diff --git a/app/Resources/client/src/routes/Answer/Answer.js b/app/Resources/client/src/routes/Answer/Answer.js
index 88232966..9f7b5692 100644
--- a/app/Resources/client/src/routes/Answer/Answer.js
+++ b/app/Resources/client/src/routes/Answer/Answer.js
@@ -22,13 +22,11 @@ class Answer extends React.Component {
       if (response instanceof APIError) {
         if (response.details.status === 401 && response.details.error.error === 'incorrect-passphrase') {
           this.props.setRequiresPassphrase(true)
-          this.props.setLoading(false)
         } else {
           browserHistory.push('/404')
         }
-      } else {
-        this.props.setLoading(false)
       }
+      this.props.setLoading(false)
     })
   }
 
diff --git a/app/Resources/client/src/routes/NotFound/NotFound.js b/app/Resources/client/src/routes/NotFound/NotFound.js
index 3857bdf2..34ee4043 100644
--- a/app/Resources/client/src/routes/NotFound/NotFound.js
+++ b/app/Resources/client/src/routes/NotFound/NotFound.js
@@ -1,12 +1,16 @@
 import React from 'react'
 import Back from 'components/Back/Back'
+import './NotFound.scss'
 
 export const NotFound = () => (
   <div>
     <Back />
     <div className='container header-container answer-header-container'>
       <div className='header center-text'>
-        <h1>404</h1>
+        <h1 className='not-found'>
+          Oh no!<br />
+          <span>It looks like we couldn't find that poll.</span>
+        </h1>
       </div>
     </div>
   </div>
diff --git a/app/Resources/client/src/routes/NotFound/NotFound.scss b/app/Resources/client/src/routes/NotFound/NotFound.scss
new file mode 100644
index 00000000..86fe8c88
--- /dev/null
+++ b/app/Resources/client/src/routes/NotFound/NotFound.scss
@@ -0,0 +1,11 @@
+h1.not-found {
+  font-size: 5em;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  position: fixed;
+
+  span {
+    font-size: 0.6em;
+  }
+}