Juick settings

1 files changed, 13 insertions, 2 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 c67eced0..231c7f89 100644
--- a/juick-www/src/main/java/com/juick/www/Main.java
+++ b/juick-www/src/main/java/com/juick/www/Main.java
@@ -194,6 +194,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
                             pm.doGetSent(sql, request, response, visitor);
                         } catch (PebbleException e) {
                             log("pebble exception", e);
+                            response.sendError(500);
                         }
                         break;
                     default:
@@ -212,7 +213,12 @@ public class Main extends HttpServlet implements Stream.StreamListener {
         } else if (uri.equals("/logout")) {
             login.doGetLogout(sql, request, response);
         } else if (uri.equals("/settings")) {
-            settings.doGet(sql, request, response);
+            try {
+                settings.doGet(sql, request, response);
+            } catch (PebbleException e) {
+                log("pebble exception", e);
+                response.sendError(500);
+            }
         } else if (uri.equals("/_fblogin")) {
             loginFacebook.doGet(sql, request, response);
         } else if (uri.equals("/_vklogin")) {
@@ -350,7 +356,12 @@ public class Main extends HttpServlet implements Stream.StreamListener {
                 signup.doPost(sql, request, response);
                 break;
             case "/settings":
-                settings.doPost(sql, request, response);
+                try {
+                    settings.doPost(sql, request, response);
+                } catch (PebbleException e) {
+                    log("pebble exception", e);
+                    response.sendError(500);
+                }
                 break;
             default:
                 response.sendError(405);