another guard

Author: ryceg

lib/api3/generic/search/operation.js

@@ -42,8 +42,8 @@ async function search (opCtx) {
       , onlyValid });
 
     if (!result)
-      throw new Error('empty result');    result.forEach(col.resolveDates);
-
+      throw new Error('empty result');
+    result.forEach(col.resolveDates);
     result.forEach(fieldsProjector.applyProjection);
 
     res.status(apiConst.HTTP.OK);

lib/data/dataloader.js

@@ -39,10 +39,10 @@ function mergeProcessSort(oldData, newData, ageLimit) {
   if (oldData && filtered) {
     merged = filtered; // Start with the new / updated data
     for (let i = 0; i < oldData.length; i++) {
-        const oldElement = oldData[i];
+        const oldElement = oldData?.[i];
         let found = false;
         for (let j = 0; j < filtered.length; j++) {
-            if (oldElement._id == filtered[j]._id) {
+            if (oldElement?._id == filtered[j]._id) {
                 found = true;
                 break;
             }