diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee
index 87fe5a2a..f866d741 100644
--- a/assets/scripts/app/app.coffee
+++ b/assets/scripts/app/app.coffee
@@ -55,7 +55,7 @@ unless window.TravisApplication
 
       type = Ember.get(Travis, 'mappings')[name]
 
-      if name == 'build' && data.build.commit
+      if name == 'build' && data.build?.commit
         # TODO: commit should be a sideload record on build, not mixed with it
         build = data.build
         commit = {
diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee
index 21ba175e..974d5a9a 100644
--- a/assets/scripts/app/models/build.coffee
+++ b/assets/scripts/app/models/build.coffee
@@ -86,7 +86,7 @@ require 'travis/model'
     Travis.ajax.post "/builds/#{@get('id')}/restart"
 
   isPropertyLoaded: (key) ->
-    if ['_duration', 'finishedAt'].contains(key) && !@get('isFinished')
+    if ['_duration', '_finishedAt'].contains(key) && !@get('isFinished')
       return true
     else
       @_super(key)
diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee
index 4a90d3b0..23649a37 100644
--- a/assets/scripts/app/models/job.coffee
+++ b/assets/scripts/app/models/job.coffee
@@ -107,9 +107,9 @@ require 'travis/model'
   ).observes('state')
 
   isPropertyLoaded: (key) ->
-    if ['finishedAt'].contains(key) && !@get('isFinished')
+    if ['_finishedAt'].contains(key) && !@get('isFinished')
       return true
-    else if key == 'startedAt' && @get('state') == 'created'
+    else if key == '_startedAt' && @get('state') == 'created'
       return true
     else
       @_super(key)
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index e39259e4..eadc1042 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -8,14 +8,14 @@
       </div>
 
       <div class="runtime">
-           {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}} 
+           {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}}
       </div>
 
       <div class="finished">
         {{formatTime build.finishedAt}}
       </div>
     </div>
- 
+
     <div class="branch" {{bind-attr title="build.commit.branch"}}>
       {{build.commit.branch}}
     </div>
diff --git a/assets/scripts/spec/integration/my_repos_spec.coffee b/assets/scripts/spec/integration/my_repos_spec.coffee
index 6011772b..b43c4a50 100644
--- a/assets/scripts/spec/integration/my_repos_spec.coffee
+++ b/assets/scripts/spec/integration/my_repos_spec.coffee
@@ -24,7 +24,7 @@ test "my repos is active by default when user is signed in", ->
         branch: 'master'
         compare: '0123456..4567890'
         finishedAt: '-'
-        duration: '1 min'
+        duration: '-'
         message: 'commit message 4'
 
 test "my repos is activated when user signs in", ->
diff --git a/assets/scripts/spec/unit/build_spec.coffee b/assets/scripts/spec/unit/build_spec.coffee
index 1cae1aed..c1b05fcc 100644
--- a/assets/scripts/spec/unit/build_spec.coffee
+++ b/assets/scripts/spec/unit/build_spec.coffee
@@ -7,7 +7,7 @@ module "Travis.Build",
     Travis.Job.resetData()
 
 test 'it does not load record on duration, finishedAt and result if job is not in finished state', ->
-  Travis.Build.load [{ id: 1, state: 'started' }]
+  Travis.Build.load [{ id: 1, state: 'started', started_at: null }]
 
   Ember.run ->
     record = Travis.Build.find 1
@@ -15,7 +15,7 @@ test 'it does not load record on duration, finishedAt and result if job is not i
     record.loadTheRest = ->
       ok(false, 'loadTheRest should not be called')
 
-    record.get('_duration')
+    record.get('duration')
     record.get('finishedAt')
     record.get('result')
 
@@ -25,7 +25,7 @@ test 'it does not load record on duration, finishedAt and result if job is not i
 test 'it loads record on duration, finishedAt and result if job is in finished state', ->
   expect(1)
 
-  Travis.Build.load [{ id: 1, state: 'passed' }]
+  Travis.Build.load [{ id: 1, state: 'passed', started_at: null }]
 
   Ember.run ->
     record = Travis.Build.find 1
diff --git a/assets/scripts/spec/unit/job_spec.coffee b/assets/scripts/spec/unit/job_spec.coffee
index 6ade37d3..fdf12984 100644
--- a/assets/scripts/spec/unit/job_spec.coffee
+++ b/assets/scripts/spec/unit/job_spec.coffee
@@ -37,7 +37,7 @@ test 'configKeys takes into account the keys of other jobs', ->
     deepEqual( configValues3, [ '1.9.3', undefined, undefined, 'OpenJDK' ] )
 
 test 'it does not load record on duration, finishedAt and result if job is not in finished state', ->
-  Travis.Job.load [{ id: 1, state: 'started' }]
+  Travis.Job.load [{ id: 1, state: 'started', started_at: null }]
 
   Ember.run ->
     record = Travis.Job.find 1
@@ -55,7 +55,7 @@ test 'it does not load record on duration, finishedAt and result if job is not i
 test 'it loads record on duration, finishedAt and result if job is in finished state', ->
   expect(1)
 
-  Travis.Job.load [{ id: 1, state: 'passed' }]
+  Travis.Job.load [{ id: 1, state: 'passed', started_at: null }]
 
   Ember.run ->
     record = Travis.Job.find 1