diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 08ac08c..94d44bf 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -30,6 +30,20 @@ class Welcome extends CI_Controller
         $this->load->view('_footer', $data);
     }
 
+    public function error404()
+    {
+        $data = array(
+            'page_title'    => array( 'Virhe 404: Sivua ei löydetty', 'Ystäväkylä eKortti' ),
+            'page_classes'  => array( 'error404' ),
+            'count'         => $this->card_count,
+            'user'          => $this->user
+        );
+
+        $this->load->view('_header', $data);
+        $this->load->view('error404', $data);
+        $this->load->view('_footer', $data);
+    }
+
     public function info()
     {
         $data = array(
diff --git a/application/views/error404.php b/application/views/error404.php
new file mode 100644
index 0000000..cc85692
--- /dev/null
+++ b/application/views/error404.php
@@ -0,0 +1,12 @@
+<?php
+
+?>
+<div class="row">
+    <div class="large-12 small-12 columns">
+        <div class="panel">
+
+            <h2>Virhe 404: Sivua ei löydetty</h2>
+
+        </div>
+    </div>
+</div>