diff --git a/package/yast2-sap-ha.changes b/package/yast2-sap-ha.changes
index e243c31..97e1288 100644
--- a/package/yast2-sap-ha.changes
+++ b/package/yast2-sap-ha.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 15 17:38:52 UTC 2024 - Peter Varkoly <varkoly@suse.com>
+
+- yast2-sap-ha: Error occurred during the unattended installation: undefined class/module SapHA::Configuration::ClusterFinalizer
+  (bsc#1221049)
+- 6.0.1
+
 -------------------------------------------------------------------
 Wed Nov 29 07:52:36 UTC 2023 - Peter Varkoly <varkoly@suse.com>
 
diff --git a/package/yast2-sap-ha.spec b/package/yast2-sap-ha.spec
index f90bab5..f354443 100644
--- a/package/yast2-sap-ha.spec
+++ b/package/yast2-sap-ha.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-sap-ha
-Version:        6.0.0
+Version:        6.0.1
 Release:        0
 BuildArch:      noarch
 Source0:        %{name}-%{version}.tar.bz2
diff --git a/src/lib/sap_ha/configuration/hana.rb b/src/lib/sap_ha/configuration/hana.rb
index 547964b..4d275fb 100644
--- a/src/lib/sap_ha/configuration/hana.rb
+++ b/src/lib/sap_ha/configuration/hana.rb
@@ -352,7 +352,7 @@ def adjust_global_ini(role)
           add_plugin_to_global_ini("SUS_TKOVER", @system_id)
         end
         command = ["hdbnsutil", "-reloadHADRProviders"]
-        _out, _status = su_exec_outerr_status("#{@system_id.downcase}adm", *command)
+        su_exec_outerr_status("#{@system_id.downcase}adm", *command)
       end
 
       # Activates the plugin in global ini
diff --git a/src/lib/sap_ha/wizard/scenario_selection_page.rb b/src/lib/sap_ha/wizard/scenario_selection_page.rb
index 7f57f4c..598a939 100644
--- a/src/lib/sap_ha/wizard/scenario_selection_page.rb
+++ b/src/lib/sap_ha/wizard/scenario_selection_page.rb
@@ -42,8 +42,12 @@ def set_contents
       end
 
       def refresh_view
-        previous_configs = SapHA::Helpers.get_configuration_files(@model.product_id)
-        previous_configs_popup(previous_configs) if !previous_configs.empty?
+        begin
+          previous_configs = SapHA::Helpers.get_configuration_files(@model.product_id)
+          previous_configs_popup(previous_configs) if !previous_configs.empty?
+	rescue StandardError => e
+          log.info "Could not parse previous config files: #{e.message}"
+	end
       end
 
       def can_go_next?