diff --git a/modules/api/api.js b/modules/api/api.js
index eea18ec..9cbb0ae 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -188,7 +188,13 @@ app.get('/ask', function (req, res) {
   } else {
     if (req.query.q && req.query.data) {
       let subj = req.query.subj || ''
-      let question = decodeURIComponent(req.query.q)
+      let question
+      try {
+        question = decodeURIComponent(req.query.q)
+      } catch (e) {
+        console.error(req.query)
+        throw e
+      }
       let recData = {}
       try {
         recData = JSON.parse(req.query.data)
diff --git a/utils/question-classes b/utils/question-classes
index f5f97bc..95a3067 160000
--- a/utils/question-classes
+++ b/utils/question-classes
@@ -1 +1 @@
-Subproject commit f5f97bcac6ce43cfe2faa4744b012596bd80f791
+Subproject commit 95a3067d623043ee34d4092f053d7ec7bdb93fa3