diff --git a/src/middlewares/auth.middleware.js b/src/middlewares/auth.middleware.js
index dbdf4c7..489a799 100644
--- a/src/middlewares/auth.middleware.js
+++ b/src/middlewares/auth.middleware.js
@@ -29,7 +29,7 @@ module.exports = function(options) {
     if (process.env.NS_NOUSER) {
       req.session = {
         user: {
-          id: 21323,
+          id: 19,
         },
         sessionID: sessionID || 111111111111111111,
         isException: false,
diff --git a/src/utils/actions.js b/src/utils/actions.js
index f743c49..2836a9c 100755
--- a/src/utils/actions.js
+++ b/src/utils/actions.js
@@ -64,6 +64,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
     try {
       // recievedData: { version: "", id: "", subj: "" quiz: {} }
       let data = recievedData
+      const recievedQuestions = []
       // FIXME: if is for backwards compatibility, remove this sometime in the future
       if (typeof data !== 'object') {
         data = JSON.parse(recievedData)
@@ -87,6 +88,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
           3
         )
         logger.DebugLog(currentQuestion, 'actions', 3)
+        recievedQuestions.push(currentQuestion)
         questionSearchPromises.push(searchData(qdb, currentQuestion, data.subj))
       })
 
@@ -95,7 +97,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
           const allQuestions = [] // all new questions here that do not have result
           results.forEach((result, i) => {
             if (result.length === 0) {
-              allQuestions.push(data.quiz[i])
+              allQuestions.push(recievedQuestions[i])
             }
           })
 
@@ -170,7 +172,10 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
         })
     } catch (err) {
       console.error(err)
-      logger.Log('There was en error handling incoming quiz data, see stderr', logger.GetColor('redbg'))
+      logger.Log(
+        'There was en error handling incoming quiz data, see stderr',
+        logger.GetColor('redbg')
+      )
       reject(new Error('Couldnt parse JSON data'))
     }
   })
diff --git a/src/utils/classes.js b/src/utils/classes.js
index b5cc7d3..05308bc 100755
--- a/src/utils/classes.js
+++ b/src/utils/classes.js
@@ -155,6 +155,9 @@ function simplifyAnswer(value) {
 }
 
 function simplifyQuestion(question) {
+  if (!question) {
+    return
+  }
   if (typeof question === 'string') {
     return simplifyQA(question, [
       removeSpecialChars,
@@ -162,16 +165,20 @@ function simplifyQuestion(question) {
       removeAnswerLetters,
     ])
   } else {
-    question.Q = simplifyQA(question.Q, [
-      removeSpecialChars,
-      removeUnnecesarySpaces,
-      removeAnswerLetters,
-    ])
-    question.A = simplifyQA(question.A, [
-      removeSpecialChars,
-      removeUnnecesarySpaces,
-      removeAnswerLetters,
-    ])
+    if (question.Q) {
+      question.Q = simplifyQA(question.Q, [
+        removeSpecialChars,
+        removeUnnecesarySpaces,
+        removeAnswerLetters,
+      ])
+    }
+    if (question.A) {
+      question.A = simplifyQA(question.A, [
+        removeSpecialChars,
+        removeUnnecesarySpaces,
+        removeAnswerLetters,
+      ])
+    }
     return question
   }
 }
diff --git a/submodules/qmining-data-editor b/submodules/qmining-data-editor
index 760dfb0..3940800 160000
--- a/submodules/qmining-data-editor
+++ b/submodules/qmining-data-editor
@@ -1 +1 @@
-Subproject commit 760dfb0c4ec005dbd496d772c7a5278cfa5071bc
+Subproject commit 3940800ace16cdf594a03f8bd0077097a4ecb5c7