diff --git a/include/limesurvey/group.php b/include/limesurvey/group.php
index b4b2e12e..7a3819ef 100644
--- a/include/limesurvey/group.php
+++ b/include/limesurvey/group.php
@@ -21,7 +21,9 @@ include_once("quexs.php"); //queXS funcitons
 $LEMdebugLevel=0;   // LEM_DEBUG_TIMING;    // (LEM_DEBUG_TIMING + LEM_DEBUG_VALIDATION_SUMMARY + LEM_DEBUG_VALIDATION_DETAIL);
 $LEMskipReprocessing=false; // true if used GetLastMoveResult to avoid generation of unneeded extra JavaScript
 
-if ($interviewer)
+$surveyMode=quexs_get_survey_mode($clienttoken);
+
+if ($interviewer || $surveyMode === false)
 {
 	switch ($thissurvey['format'])
 	{
@@ -37,8 +39,6 @@ if ($interviewer)
 	        break;
 	}
 }
-else
-	$surveyMode=quexs_get_survey_mode($clienttoken);
 
 $radix=getRadixPointData($thissurvey['surveyls_numberformat']);
 $radix = $radix['seperator'];
diff --git a/include/limesurvey/quexs.php b/include/limesurvey/quexs.php
index a57a95c0..b1db8821 100644
--- a/include/limesurvey/quexs.php
+++ b/include/limesurvey/quexs.php
@@ -109,7 +109,13 @@ function quexs_get_survey_mode($clienttoken)
 		WHERE q.questionnaire_id = c.questionnaire_id
 		AND c.token = '$clienttoken'";
 
-	return $db->GetOne($sql);
+  $md = $db->GetOne($sql);
+
+  if (empty($md)) {
+    return false;        
+  } else {
+    return $md;
+  }
 }