diff --git a/assets/scripts/app/controllers/repo.coffee b/assets/scripts/app/controllers/repo.coffee
index 256ba110..75894468 100644
--- a/assets/scripts/app/controllers/repo.coffee
+++ b/assets/scripts/app/controllers/repo.coffee
@@ -3,6 +3,10 @@ Travis.RepoController = Travis.Controller.extend
   needs: ['repos', 'currentUser']
   currentUserBinding: 'controllers.currentUser'
 
+  isError: (-> @get('content.isError') ).property('content.isError')
+  slug: (-> @get('content.slug') ).property('content.slug')
+  isLoading: (-> @get('content.isLoading') ).property('content.isLoading')
+
   init: ->
     @_super.apply this, arguments
     Ember.run.later(@updateTimes.bind(this), Travis.INTERVALS.updateTimes)
diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index 5d558962..3de2cdd5 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -140,7 +140,7 @@ Travis.RepoRoute = Ember.Route.extend
 
   deserialize: (params) ->
     slug = "#{params.owner}/#{params.name}"
-    content = Ember.Object.create slug: slug, isLoaded: false
+    content = Ember.Object.create slug: slug, isLoaded: false, isLoading: true
     proxy = Ember.ObjectProxy.create(content: content)
 
     repos = Travis.Repo.bySlug(slug)
@@ -148,7 +148,14 @@ Travis.RepoRoute = Ember.Route.extend
     observer = ->
       if repos.get 'isLoaded'
         repos.removeObserver 'isLoaded', observer
-        proxy.set 'content', repos.objectAt(0)
+        proxy.set 'isLoading', false
+
+        if repos.get('length') == 0
+          # isError is also used in DS.Model, but maybe we should use something
+          # more focused like notFound later
+          proxy.set 'isError', true
+        else
+          proxy.set 'content', repos.objectAt(0)
 
     if repos.length
       proxy.set('content', repos[0])
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index 3cda0ced..63ce6e62 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -2,25 +2,28 @@
   {{#if view.isEmpty}}
     {{view Travis.ReposEmptyView}}
   {{else}}
-    {{#if repo.isLoaded}}
-      {{#with repo}}
-        <h3>
-          <a {{bindAttr href="controller.urlGithub"}}>{{slug}}</a>
-        </h3>
-
-        <p class="description">{{description}}</p>
-
-        {{view Travis.RepoShowTabsView}}
-        {{view Travis.RepoShowToolsView}}
-      {{/with}}
-
+    {{#if isError}}
+      <span class="not-found">The repository at {{slug}} was not found.</span>
     {{else}}
-      <span>Loading</span>
-    {{/if}}
+      {{#if repo.isLoaded}}
+        {{#with repo}}
+          <h3>
+            <a {{bindAttr href="controller.urlGithub"}}>{{slug}}</a>
+          </h3>
 
-    <div class="tab">
-      {{outlet pane}}
-    </div>
+          <p class="description">{{description}}</p>
+
+          {{view Travis.RepoShowTabsView}}
+          {{view Travis.RepoShowToolsView}}
+        {{/with}}
+
+        <div class="tab">
+          {{outlet pane}}
+        </div>
+      {{else}}
+        <span>Loading</span>
+      {{/if}}
+    {{/if}}
   {{/if}}
 </div>
 
diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee
index 0664abd8..a7e04613 100644
--- a/assets/scripts/app/views/repo/show.coffee
+++ b/assets/scripts/app/views/repo/show.coffee
@@ -5,8 +5,7 @@ Travis.reopen
     repoBinding:  'controllers.repo'
     reposBinding: 'controllers.repos'
 
-    isLoadedBinding: 'repo.isLoaded'
-    classNameBindings: ['loading:isLoaded']
+    classNameBindings: ['controller.isLoading:loading']
 
     isEmpty: (->
       @get('repos.isLoaded') && @get('repos.length') == 0
diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass
index b7ba2912..d90963f5 100644
--- a/assets/styles/main/repository.sass
+++ b/assets/styles/main/repository.sass
@@ -6,6 +6,11 @@
   overflow-x: hidden
   padding-right: 10px
 
+  .not-found
+    display: block
+    padding: 10px 5px
+    font-size: 12px
+
   .description, .language
     font-weight: normal
     color: $color-text-light