diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34729c154..d0555e3fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,10 @@
 # - musrfit 
 cmake_minimum_required(VERSION 3.9)
 
+if (CMAKE_VERSION GREATER_EQUAL 3.12)
+  cmake_policy(SET CMP0075 NEW)
+endif (CMAKE_VERSION GREATER_EQUAL 3.12)
+
 project(musrfit VERSION 1.5.1 LANGUAGES C CXX)
 
 #--- musrfit specific options -------------------------------------------------
diff --git a/src/musredit_qt5/mupp/PmuppGui.cpp b/src/musredit_qt5/mupp/PmuppGui.cpp
index 4e3475ce4..d0cebfff1 100644
--- a/src/musredit_qt5/mupp/PmuppGui.cpp
+++ b/src/musredit_qt5/mupp/PmuppGui.cpp
@@ -371,8 +371,12 @@ PmuppGui::PmuppGui( QStringList fln, QWidget *parent, Qt::WindowFlags f )
   setCentralWidget(fCentralWidget);
 
   // in case there is no db/dat file list given open the db/dat file open menu automatically.
-  if (fln.size() == 0)
+  if (fln.size() == 0) {
     fileOpen();
+    if (fParamDataHandler->GetNoOfCollections() == 0) { // file open dialog has been cancelled
+      exit(0);
+    }
+  }
 }
 
 //----------------------------------------------------------------------------------------------------