Merge branch 'dev'

1 files changed, 7 insertions, 1 deletions

diff --git a/include/text.php b/include/text.php
index 8a07dc113..4b5442985 100644
--- a/include/text.php
+++ b/include/text.php
@@ -37,7 +37,13 @@ function replace_macros($s, $r) {
 	call_hooks('replace_macros', $arr);
 
 	$t = App::template_engine();
-	$output = $t->replace_macros($arr['template'], $arr['params']);
+
+        try {
+	        $output = $t->replace_macros($arr['template'], $arr['params']);
+        } catch (Exception $e) {
+                logger("Unable to render template: ",$e->getMessage());
+                $output = "<h3>ERROR: there was an error creating the output.</h3>";
+        }
 
 	return $output;
 }