diff --git a/src/Hydra/lib/Hydra/Controller/Build.pm b/src/Hydra/lib/Hydra/Controller/Build.pm
index 6f20ac8a..b706847a 100644
--- a/src/Hydra/lib/Hydra/Controller/Build.pm
+++ b/src/Hydra/lib/Hydra/Controller/Build.pm
@@ -68,8 +68,8 @@ sub view_log : Chained('build') PathPart('log') Args(0) {
 sub loadLog {
     my ($c, $path) = @_;
 
-    die unless defined $path;
-
+    notFound($c, "Log file $path no longer exists.") unless -f $path;
+    
     # !!! quick hack
     my $pipeline = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path")
         . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
diff --git a/src/Hydra/root/error.tt b/src/Hydra/root/error.tt
index 7b0e4049..f194d5bc 100644
--- a/src/Hydra/root/error.tt
+++ b/src/Hydra/root/error.tt
@@ -3,6 +3,6 @@
 
 <h1>[% IF httpStatus %][% httpStatus %][% ELSE %]Error[% END %]</h1>
 
-<p>I'm very sorry, but an error occurred: <span class="error-msg">[% FOREACH error IN errors %] [% HTML.escape(error) %] [% END %]</span></p>
+<p>I'm very sorry, but an error occurred: <span class="error-msg">[% FOREACH error IN errors %][% HTML.escape(error) %][% END %]</span></p>
 
 [% END %]