diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
index 88a70ef1d2..5ac14e77ce 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
@@ -41,8 +41,11 @@ void RivReservoirPartMgr::clearAndSetReservoir(const RigCaseData* eclipseCase, c
             m_allGrids.push_back(new RivGridPartMgr(grids[i], i, faultCollection));
         }
 
-        // Faults read from file are present only on main grid
-        m_faultsPartMgr = new RivReservoirFaultsPartMgr(eclipseCase->mainGrid(), faultCollection);
+        if (eclipseCase->mainGrid())
+        {
+            // Faults read from file are present only on main grid
+            m_faultsPartMgr = new RivReservoirFaultsPartMgr(eclipseCase->mainGrid(), faultCollection);
+        }
     }
 }
 
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
index 062719de3c..b6a201af09 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
@@ -187,7 +187,7 @@ bool faultComparator(const cvf::ref<RigFault>& a, const cvf::ref<RigFault>& b)
 //--------------------------------------------------------------------------------------------------
 void RimFaultCollection::syncronizeFaults()
 {
-    if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData()) ) return;
+    if (!(m_reservoirView && m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid()) ) return;
 
     cvf::ref<cvf::Color3fArray> partColors = RivColorTableArray::colorTableArray();
 
diff --git a/OctavePlugin/OctaveScripts/kslice.m b/OctavePlugin/OctaveScripts/kslice.m
index 4049e6c80d..a0f8cc5141 100644
--- a/OctavePlugin/OctaveScripts/kslice.m
+++ b/OctavePlugin/OctaveScripts/kslice.m
@@ -1,4 +1,4 @@
-addpath("/home/builder/Projects/ResInsightBuildDir/OctavePlugin");
+
 CInfo = riGetActiveCellInfo();
 SOIL = riGetActiveCellProperty("SOIL");