diff --git a/ApplicationCode/FileInterface/RifWellPathImporter.cpp b/ApplicationCode/FileInterface/RifWellPathImporter.cpp
index de8199efa0..46181be233 100644
--- a/ApplicationCode/FileInterface/RifWellPathImporter.cpp
+++ b/ApplicationCode/FileInterface/RifWellPathImporter.cpp
@@ -166,6 +166,7 @@ RifWellPathImporter::WellData RifWellPathImporter::readJsonWellData(const QStrin
     double datumElevation = jsonMap["datumElevation"].toDouble();
     QList<QVariant> pathList = jsonMap["path"].toList();
     WellData wellData;
+    wellData.m_wellPathGeometry = new RigWellPath;
     wellData.m_wellPathGeometry->setDatumElevation(datumElevation);
     wellData.m_name = jsonMap["name"].toString();
 
diff --git a/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp b/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
index 116a9d1e3e..9ea472dc6a 100644
--- a/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
@@ -60,17 +60,24 @@ void RigSingleWellResultsData::computeMappingFromResultTimeIndicesToWellTimeIndi
         }
     }
 
-    for (size_t resultTimeStepIndex = 0; resultTimeStepIndex< simulationTimeSteps.size(); resultTimeStepIndex++)
+    size_t wellTimeStepIndex = 0;
+    for (size_t resultTimeStepIndex = 0; resultTimeStepIndex < simulationTimeSteps.size(); resultTimeStepIndex++)
     {
-        size_t wellTimeStepIndex = 0;
-
-        while (wellTimeStepIndex < m_wellCellsTimeSteps.size() &&
-               m_wellCellsTimeSteps[wellTimeStepIndex].m_timestamp < simulationTimeSteps[resultTimeStepIndex])
+        while ( wellTimeStepIndex < m_wellCellsTimeSteps.size() &&
+                m_wellCellsTimeSteps[wellTimeStepIndex].m_timestamp < simulationTimeSteps[resultTimeStepIndex])
         {
             wellTimeStepIndex++;
         }
 
-        m_resultTimeStepIndexToWellTimeStepIndex[resultTimeStepIndex] = wellTimeStepIndex;
+        if (   wellTimeStepIndex < m_wellCellsTimeSteps.size() 
+            && m_wellCellsTimeSteps[wellTimeStepIndex].m_timestamp == simulationTimeSteps[resultTimeStepIndex])
+        {
+            m_resultTimeStepIndexToWellTimeStepIndex[resultTimeStepIndex] = wellTimeStepIndex;
+        }
+        else
+        {
+            m_resultTimeStepIndexToWellTimeStepIndex[resultTimeStepIndex] = cvf::UNDEFINED_SIZE_T;
+        }
     }
 }