diff --git a/ApplicationCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp b/ApplicationCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
index 9fe49f482e..28400bf6c0 100644
--- a/ApplicationCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
+++ b/ApplicationCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
@@ -130,6 +130,11 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( DateTimePeriod per
     const auto& origTimeSteps = m_originalValues.second;
     const auto& origValues    = m_originalValues.first;
 
+    if ( origValues.empty() || origTimeSteps.empty() )
+    {
+        return;
+    }
+
     computeResampledTimeSteps( period );
 
     m_values.reserve( m_timeSteps.size() );
@@ -198,6 +203,11 @@ void RiaTimeHistoryCurveResampler::computePeriodEndValues( DateTimePeriod period
     const auto& origTimeSteps = m_originalValues.second;
     const auto& origValues    = m_originalValues.first;
 
+    if ( origValues.empty() || origTimeSteps.empty() )
+    {
+        return;
+    }
+
     computeResampledTimeSteps( period );
 
     m_values.reserve( m_timeSteps.size() );
diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInViewTools.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInViewTools.cpp
index fb30d27e4e..82023aefd9 100644
--- a/ApplicationCode/ProjectDataModel/RimSimWellInViewTools.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSimWellInViewTools.cpp
@@ -159,6 +159,12 @@ double RimSimWellInViewTools::extractValueForTimeStep( RifSummaryReaderInterface
     std::vector<double> values;
     summaryReader->values( addr, &values );
     std::vector<time_t> timeSteps = summaryReader->timeSteps( addr );
+    if ( values.empty() || timeSteps.empty() )
+    {
+        std::cerr << "Warning: no data found for well " << wellName.toStdString() << " " << vectorName << std::endl;
+        *isOk = false;
+        return 0.0;
+    }
 
     RiaTimeHistoryCurveResampler resampler;
     resampler.setCurveData( values, timeSteps );