diff --git a/src/common/helper.js b/src/common/helper.js
index e407f0f..d8718e4 100755
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -244,7 +244,7 @@ async function fetchFromES (query, resource) {
   const docs = await osClient.search({
     index: config.get('osConfig.OS_INDEX'),
     body: filter
-})
+  })
 
   // Extract data from hits
   const rows = _.map(docs.body.hits.hits, single => single._source)
diff --git a/src/common/informixHelper.js b/src/common/informixHelper.js
index eb34499..20e1e22 100644
--- a/src/common/informixHelper.js
+++ b/src/common/informixHelper.js
@@ -1,5 +1,5 @@
 /**
- * Contains Informix helper methods for loading reviews from Informix 
+ * Contains Informix helper methods for loading reviews from Informix
  */
 const config = require('config')
 const logger = require('./logger')
@@ -41,6 +41,10 @@ async function loadOnlineReviewDetails (authUser, submission) {
 
     const reviews = queryInformix(query)
 
+    if (!reviews) {
+      return
+    }
+
     for await (const dbReview of reviews) {
       if (!submission.review) {
         submission.review = []
diff --git a/src/services/SubmissionService.js b/src/services/SubmissionService.js
index b562564..a82ac0d 100755
--- a/src/services/SubmissionService.js
+++ b/src/services/SubmissionService.js
@@ -765,7 +765,7 @@ async function countSubmissions (challengeId) {
     result = await osClient.search({
       index: config.get('osConfig.OS_INDEX'),
       body: esQuery
-  })
+    })
   } catch (err) {
     logger.error(`Get Submission Count Error ${JSON.stringify(err)}`)
     throw err