Index: /branches/release-41/lib/MT/App.pm
===================================================================
--- /branches/release-41/lib/MT/App.pm (revision 2644)
+++ /branches/release-41/lib/MT/App.pm (revision 2673)
@@ -2103,5 +2103,6 @@
     my $out = $tmpl->output;
     if (!defined $out) {
-        return $tmpl->errstr;
+        return "Can't build error template; got error '" . $tmpl->errstr
+            . "'. Giving up. Original error was <pre>$param->{error}</pre>";
     }
     return $app->l10n_filter($out);