diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
index 3d7231630d..9b3357a8e1 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
@@ -56,7 +56,7 @@ CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorage, "ReservoirCellResultStorage"
 //--------------------------------------------------------------------------------------------------
 RimReservoirCellResultsStorage::RimReservoirCellResultsStorage()
     : m_cellResults(NULL), 
-      m_ownerMainGrid(NULL)
+    m_ownerMainGrid(NULL)
 {
     CAF_PDM_InitObject("Cacher", "", "", "");
 
@@ -136,7 +136,7 @@ void RimReservoirCellResultsStorage::setupBeforeSave()
             // If there is no data, we do not store anything for the current result variable
             // (Even not the metadata, of cause)
             size_t timestepCount = m_cellResults->cellScalarResults(resInfo[rIdx].m_gridScalarResultIndex).size();
-            
+
             if (timestepCount && resInfo[rIdx].m_needsToBeStored)
             {
                 progInfo.setProgressDescription(resInfo[rIdx].m_resultName);
@@ -251,7 +251,7 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResultForTimeStep(RimDefi
         if (soilScalarResultIndex == cvf::UNDEFINED_SIZE_T)
         {
             computeSOILForTimeStep(timeStepIndex);
-            
+
             soilScalarResultIndex = m_cellResults->findScalarResultIndex(type, resultName);
             return soilScalarResultIndex;
         }
@@ -419,32 +419,22 @@ void RimReservoirCellResultsStorage::computeSOILForTimeStep(size_t timeStepIndex
     size_t soilResultValueCount = 0;
     size_t soilTimeStepCount = 0;
 
-    std::vector<double>* swatForTimeStep = NULL;
-    std::vector<double>* sgasForTimeStep = NULL;
     if (scalarIndexSWAT != cvf::UNDEFINED_SIZE_T)
     {
-        swatForTimeStep = &(m_cellResults->cellScalarResults(scalarIndexSWAT, timeStepIndex));
-        if (swatForTimeStep->size() == 0)
+        std::vector<double>& swatForTimeStep = m_cellResults->cellScalarResults(scalarIndexSWAT, timeStepIndex);
+        if (swatForTimeStep.size() > 0)
         {
-            swatForTimeStep = NULL;
-        }
-        else
-        {
-            soilResultValueCount = swatForTimeStep->size();
+            soilResultValueCount = swatForTimeStep.size();
             soilTimeStepCount = m_cellResults->infoForEachResultIndex()[scalarIndexSWAT].m_timeStepDates.size();
         }
     }
 
     if (scalarIndexSGAS != cvf::UNDEFINED_SIZE_T)
     {
-        sgasForTimeStep = &(m_cellResults->cellScalarResults(scalarIndexSGAS, timeStepIndex));
-        if (sgasForTimeStep->size() == 0)
+        std::vector<double>& sgasForTimeStep = m_cellResults->cellScalarResults(scalarIndexSGAS, timeStepIndex);
+        if (sgasForTimeStep.size() > 0)
         {
-            sgasForTimeStep = NULL;
-        }
-        else
-        {
-            soilResultValueCount = qMax(soilResultValueCount, sgasForTimeStep->size());
+            soilResultValueCount = qMax(soilResultValueCount, sgasForTimeStep.size());
 
             size_t sgasTimeStepCount = m_cellResults->infoForEachResultIndex()[scalarIndexSGAS].m_timeStepDates.size();
             soilTimeStepCount = qMax(soilTimeStepCount, sgasTimeStepCount);
@@ -468,6 +458,28 @@ void RimReservoirCellResultsStorage::computeSOILForTimeStep(size_t timeStepIndex
         }
     }
 
+
+    std::vector<double>* swatForTimeStep = NULL;
+    std::vector<double>* sgasForTimeStep = NULL;
+
+    if (scalarIndexSWAT != cvf::UNDEFINED_SIZE_T)
+    {
+        swatForTimeStep = &(m_cellResults->cellScalarResults(scalarIndexSWAT, timeStepIndex));
+        if (swatForTimeStep->size() == 0)
+        {
+            swatForTimeStep = NULL;
+        }
+    }
+
+    if (scalarIndexSGAS != cvf::UNDEFINED_SIZE_T)
+    {
+        sgasForTimeStep = &(m_cellResults->cellScalarResults(scalarIndexSGAS, timeStepIndex));
+        if (sgasForTimeStep->size() == 0)
+        {
+            sgasForTimeStep = NULL;
+        }
+    }
+
     std::vector<double>& soilForTimeStep = m_cellResults->cellScalarResults(soilResultGridIndex, timeStepIndex);
 
 #pragma omp parallel for
@@ -514,7 +526,7 @@ void RimReservoirCellResultsStorage::computeDepthRelatedResults()
 
     if (depthResultGridIndex == cvf::UNDEFINED_SIZE_T)
     {
-         depthResultGridIndex = m_cellResults->addStaticScalarResult(RimDefines::STATIC_NATIVE, "DEPTH", false, resultValueCount);
+        depthResultGridIndex = m_cellResults->addStaticScalarResult(RimDefines::STATIC_NATIVE, "DEPTH", false, resultValueCount);
         computeDepth = true;
     }
 
@@ -694,7 +706,7 @@ void RimReservoirCellResultsStorage::setCellResults(RigCaseCellResultsData* cell
         for (size_t tsIdx = 0; tsIdx < resInfo->m_timeStepDates().size(); ++tsIdx)
         {
             std::vector<double>* data = NULL;
-           
+
             data = &(m_cellResults->cellScalarResults(rIdx, tsIdx));
 
             quint64 cellCount = 0;
@@ -760,4 +772,4 @@ RimReservoirCellResultsStorageEntryInfo::RimReservoirCellResultsStorageEntryInfo
 RimReservoirCellResultsStorageEntryInfo::~RimReservoirCellResultsStorageEntryInfo()
 {
 
-}
+}
\ No newline at end of file