diff --git a/app/router.coffee b/app/router.coffee
index 7dfb7326..a51732b6 100644
--- a/app/router.coffee
+++ b/app/router.coffee
@@ -76,5 +76,6 @@ Router.map ->
     # @route 'running', path: '/running'
 
   @route 'error404', path: '/*path'
+  @route 'error404', path: '/404'
 
 `export default Router`
diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee
index 8e134009..5f9c06e1 100644
--- a/app/routes/owner.coffee
+++ b/app/routes/owner.coffee
@@ -21,8 +21,10 @@ Route = TravisRoute.extend
   actions:
     error: (error, transition, originRoute) ->
       login = transition.params.owner.owner
+
       message = if error.status == 404
-        "Couldn't find an owner with login \"#{login}\""
+        @transitionTo('/404')
+        # "Couldn't find an owner with login \"#{login}\""
       else
         "There was an error while loading data, please try again."
 
diff --git a/app/templates/components/build-tile.hbs b/app/templates/components/build-tile.hbs
index 7216bd17..62fe2f83 100644
--- a/app/templates/components/build-tile.hbs
+++ b/app/templates/components/build-tile.hbs
@@ -1,5 +1,5 @@
 {{#if build.number}}
-  {{#link-to "build" build.repository.slug build.id class="dropup-trigger"}}
+  {{#link-to "build" build.repository build.id class="dropup-trigger"}}
     {{status-icon status=build.state}}
 
     {{build.last_build.state}}
diff --git a/app/templates/owner/error.hbs b/app/templates/owner/error.hbs
index 257cc564..ba0679e9 100644
--- a/app/templates/owner/error.hbs
+++ b/app/templates/owner/error.hbs
@@ -1 +1 @@
-foo
+There was an error.
\ No newline at end of file