diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 6322f257..fda80880 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -41,7 +41,7 @@ sub view_build : Chained('build') PathPart('') Args(0) {
 
     if (defined $build->resultInfo && $build->resultInfo->iscachedbuild) {
         (my $cachedBuildStep) = $c->model('DB::BuildSteps')->search({ outpath => $build->outpath }, {}) ;
-        $c->stash->{cachedBuild} = $cachedBuildStep->build;
+        $c->stash->{cachedBuild} = $cachedBuildStep->build if defined $cachedBuildStep;
     }
 
 }
diff --git a/src/root/build.tt b/src/root/build.tt
index e9de3dd1..8a279ddb 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -150,7 +150,7 @@
     <td>[% INCLUDE renderDateTime timestamp = build.timestamp %]</td>
   </tr>
   [% IF build.finished && build.resultInfo.buildstatus != 4 %]
-    [% IF build.resultInfo.iscachedbuild %]
+    [% IF build.resultInfo.iscachedbuild && cachedBuild %]
       <tr>
         <th>Cached build:</th>
         <td><a href="[% c.uri_for('/build' cachedBuild.id ) %]">[% cachedBuild.id %]</a></td>