diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp
index 4271085fe0..74b51c792c 100644
--- a/ApplicationCode/Application/RiaPreferences.cpp
+++ b/ApplicationCode/Application/RiaPreferences.cpp
@@ -65,10 +65,8 @@ RiaPreferences::RiaPreferences(void)
     lastUsedProjectFileName.setUiHidden(true);
 
     CAF_PDM_InitField(&autocomputeDepthRelatedProperties,   "autocomputeDepth", true, "DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", "");
-    CAF_PDM_InitField(&autocomputeGridFaults,               "autocomputeGridFaults", true, "Grid faults", "", "Detect all fault faces geometrically", "");
 
     autocomputeDepthRelatedProperties.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
-    autocomputeGridFaults.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
 
     readerSettings = new RifReaderSettings;
     CAF_PDM_InitFieldNoDefault(&readerSettings,        "readerSettings", "Reader settings", "", "", "");
@@ -99,8 +97,7 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
         }
     }
     else if (field == &octaveShowHeaderInfoWhenExecutingScripts ||
-             field == &autocomputeDepthRelatedProperties ||
-             field == &autocomputeGridFaults)
+             field == &autocomputeDepthRelatedProperties)
     {
         caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
         if (myAttr)
@@ -135,8 +132,6 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 
     caf::PdmUiGroup* autoComputeGroup = uiOrdering.addNewGroup("Compute when loading new case");
     autoComputeGroup->add(&autocomputeDepthRelatedProperties);
-    autoComputeGroup->add(&autocomputeGridFaults);
-
     
     caf::PdmUiGroup* readerSettingsGroup = uiOrdering.addNewGroup("Reader settings");
     std::vector<caf::PdmFieldHandle*> readerSettingsFields;
diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h
index 7d3f89b9ff..604adf122a 100644
--- a/ApplicationCode/Application/RiaPreferences.h
+++ b/ApplicationCode/Application/RiaPreferences.h
@@ -65,7 +65,6 @@ public: // Pdm Fields
     caf::PdmField<QString>  lastUsedProjectFileName;
 
     caf::PdmField<bool>     autocomputeDepthRelatedProperties;
-    caf::PdmField<bool>     autocomputeGridFaults;
 
     caf::PdmField<RifReaderSettings*> readerSettings;
 
diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp
index 9343c17afe..371f5c8f6d 100644
--- a/ApplicationCode/ProjectDataModel/RimCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCase.cpp
@@ -307,13 +307,9 @@ void RimCase::computeCachedData()
         rigEclipseCase->mainGrid()->computeCachedData();
         pInf.incrementProgress();
 
-        RiaPreferences* prefs = RiaApplication::instance()->preferences();
-        if (prefs->autocomputeGridFaults)
-        {
-            pInf.setProgressDescription("Calculating faults");
-            rigEclipseCase->mainGrid()->calculateFaults();
-            pInf.incrementProgress();
-        }
+        pInf.setProgressDescription("Calculating faults");
+        rigEclipseCase->mainGrid()->calculateFaults();
+        pInf.incrementProgress();
     }
 }
 
diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
index 0e5412221f..9d6c271c62 100644
--- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
@@ -405,6 +405,8 @@ bool RigMainGrid::isFaceNormalsOutwards() const
 //--------------------------------------------------------------------------------------------------
 const RigFault* RigMainGrid::findFaultFromCellIndexAndCellFace(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) const
 {
+    CVF_ASSERT(m_faultsPrCellAcc.notNull());
+
     int faultIdx = m_faultsPrCellAcc->faultIdx(reservoirCellIndex, face);
     if (faultIdx !=  RigFaultsPrCellAccumulator::NO_FAULT )
     {