pebble WIP

1 files changed, 7 insertions, 1 deletions

diff --git a/juick-www/src/main/java/com/juick/www/Main.java b/juick-www/src/main/java/com/juick/www/Main.java
index c249995f..1e755ca3 100644
--- a/juick-www/src/main/java/com/juick/www/Main.java
+++ b/juick-www/src/main/java/com/juick/www/Main.java
@@ -21,6 +21,7 @@ import com.juick.server.UserQueries;
 import com.juick.xmpp.JID;
 import com.juick.xmpp.Stream;
 import com.juick.xmpp.StreamComponent;
+import com.mitchellbosecke.pebble.error.PebbleException;
 import net.jodah.failsafe.Execution;
 import net.jodah.failsafe.RetryPolicy;
 import org.apache.commons.dbcp2.BasicDataSource;
@@ -181,7 +182,12 @@ public class Main extends HttpServlet implements Stream.StreamListener {
             } else {
                 switch (uri) {
                     case "/pm/inbox":
-                        pm.doGetInbox(sql, request, response, visitor);
+                        try {
+                            pm.doGetInbox(sql, request, response, visitor);
+                        } catch (PebbleException e) {
+                            log("pebble exception", e);
+                            response.sendError(500);
+                        }
                         break;
                     case "/pm/sent":
                         pm.doGetSent(sql, request, response, visitor);