6 files changed, 8 insertions, 3 deletions
diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc
index 8cbc1bb24526..8cbc1bb24526 100644..100755
--- a/testautomation/global/required/includes/g_001.inc
+++ b/testautomation/global/required/includes/g_001.inc
diff --git a/testautomation/global/required/includes/g_009.inc b/testautomation/global/required/includes/g_009.inc
index 61ef7dd95c37..61ef7dd95c37 100644..100755
--- a/testautomation/global/required/includes/g_009.inc
+++ b/testautomation/global/required/includes/g_009.inc
diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc
index 07c2dde3927d..07c2dde3927d 100644..100755
--- a/testautomation/global/required/includes/g_customize.inc
+++ b/testautomation/global/required/includes/g_customize.inc
diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc
index 2539e12455e5..2539e12455e5 100644..100755
--- a/testautomation/global/required/includes/g_numberformatter1.inc
+++ b/testautomation/global/required/includes/g_numberformatter1.inc
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 2f7b6aa33ac2..0c40d3c3d08e 100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -756,7 +756,7 @@ testcase tToolsOptionsImprovementProgram
             Active.ok()
         else
             if ( NOT bImportDialogHasBeenDisplayed ) then
-                qaerrorlog( "#i97340# Show Data button enabled but no logged data found" )
+                warnlog( "#i97340# Show Data button enabled but no logged data found" )
             endif
         endif
 
@@ -767,8 +767,13 @@ testcase tToolsOptionsImprovementProgram
         endif
 
         Kontext "OptionenDlg"
-        OptionenDlg.cancel()
-        
+        if OptionenDlg.Exists then
+            OptionenDlg.cancel()
+        endif
+
+        if GetDocumentCount = 1 then
+            Call hCloseDocument
+        endif
     else
         ' hDeleteFile() returns FALSE if the file is still present for some weird reason
         ' We should warn about this because the test breaks at a later point then.
diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc
index 233b6cb9d9cc..233b6cb9d9cc 100644..100755
--- a/testautomation/global/required/includes/g_option_application.inc
+++ b/testautomation/global/required/includes/g_option_application.inc