diff --git a/ApplicationLibCode/FileInterface/RifInputPropertyLoader.cpp b/ApplicationLibCode/FileInterface/RifInputPropertyLoader.cpp
index 32366fe747..3f22717850 100644
--- a/ApplicationLibCode/FileInterface/RifInputPropertyLoader.cpp
+++ b/ApplicationLibCode/FileInterface/RifInputPropertyLoader.cpp
@@ -39,6 +39,8 @@ void RifInputPropertyLoader::loadAndSynchronizeInputProperties( RimEclipseInputP
                                                                 const std::vector<QString>&        filenames,
                                                                 bool                               allowImportOfFaults )
 {
+    if ( !inputPropertyCollection || !eclipseCaseData || filenames.empty() ) return;
+
     std::vector<RimEclipseInputProperty*> existingProperties = inputPropertyCollection->inputProperties.childrenByType();
 
     caf::ProgressInfo progInfo( static_cast<int>( filenames.size() ), "Reading Input properties" );
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
index 08b2558c88..5a84385cff 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
@@ -704,18 +704,12 @@ void RimEclipseCase::loadAndSynchronizeInputProperties( bool importGridOrFaultDa
 {
     // Make sure we actually have reservoir data
 
-    CVF_ASSERT( eclipseCaseData() );
-    CVF_ASSERT( eclipseCaseData()->mainGrid()->cellCount() != 0 );
+    if ( !eclipseCaseData() || !eclipseCaseData()->mainGrid() || ( eclipseCaseData()->mainGrid()->cellCount() == 0 ) ) return;
 
-    // Then read the properties from all the files referenced by the InputReservoir
-
-    std::vector<QString> filenames;
-    for ( const QString& fileName : additionalFiles() )
-    {
-        filenames.push_back( fileName );
-    }
-
-    RifInputPropertyLoader::loadAndSynchronizeInputProperties( inputPropertyCollection(), eclipseCaseData(), filenames, importGridOrFaultData );
+    RifInputPropertyLoader::loadAndSynchronizeInputProperties( inputPropertyCollection(),
+                                                               eclipseCaseData(),
+                                                               additionalFiles(),
+                                                               importGridOrFaultData );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
index 9192d8dd88..b11f6317b5 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp
@@ -240,6 +240,18 @@ bool RimEclipseResultCase::importGridAndResultMetaData( bool showTimeStepFilter
             return false;
         }
 
+        if ( eclipseCase->mainGrid() == nullptr )
+        {
+            RiaLogging::error( "Eclipse grid file does not contain a valid grid." );
+            return false;
+        }
+
+        if ( eclipseCase->mainGrid()->cellCount() == 0 )
+        {
+            RiaLogging::error( "Eclipse grid file does not contain any cells." );
+            return false;
+        }
+
         setFilesContainingFaults( readerInterface->filenamesWithFaults() );
 
         setReservoirData( eclipseCase.p() );