From 5e38c909cf49ffc2c2db461968f10f09e836a96c Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Thu, 7 Feb 2013 10:12:59 +0100
Subject: [PATCH] Early exit when data fails to load p4#: 20405

---
 ApplicationCode/ProjectDataModel/RimReservoirView.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index 7deb2b0bcc..129737f2cf 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -680,6 +680,8 @@ void RimReservoirView::loadDataAndUpdate()
         if (!m_reservoir->openEclipseGridFile())
         {
             QMessageBox::warning(RIMainWindow::instance(), "Error when opening project file", "Could not open the Eclipse Grid file (EGRID/GRID): \n"+ m_reservoir->caseName());
+            m_reservoir = NULL;
+            return;
         }
         else
         {