diff --git a/src/main/engine/net/sf/jailer/util/LogUtil.java b/src/main/engine/net/sf/jailer/util/LogUtil.java
index d643eaf22..d70cf6b97 100644
--- a/src/main/engine/net/sf/jailer/util/LogUtil.java
+++ b/src/main/engine/net/sf/jailer/util/LogUtil.java
@@ -5,7 +5,7 @@ import java.io.File;
 public class LogUtil {
 
 	public static void initLog4jConfig(File baseDir) {
-		System.setProperty("logdir", baseDir.getAbsolutePath() + File.separator);
+		System.setProperty("logdir", baseDir != null? baseDir.getAbsolutePath() + File.separator : "");
 	}
 
 	public interface Warn {
diff --git a/src/main/gui/net/sf/jailer/ui/ExtractionModelFrame.java b/src/main/gui/net/sf/jailer/ui/ExtractionModelFrame.java
index 4fb3b84e4..c47d915b2 100644
--- a/src/main/gui/net/sf/jailer/ui/ExtractionModelFrame.java
+++ b/src/main/gui/net/sf/jailer/ui/ExtractionModelFrame.java
@@ -1511,6 +1511,7 @@ public class ExtractionModelFrame extends javax.swing.JFrame {
 												}
 											}
 											String file = exportDialog.getInsertFileName();
+											file = Environment.newFile(file).getPath();
 											if (file != null) {
 												try {
 													UIUtil.setWaitCursor(window);
diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java b/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
index c59a6fa76..589644fb8 100644
--- a/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
+++ b/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
@@ -3349,9 +3349,9 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
 
 			final ExtractionModelFrame extractionModelFrame = ExtractionModelFrame.createFrame(file, false, !doExport, null, executionContext);
 			extractionModelFrame.setDefaultExportFileName("by-example" + File.separator + UIUtil.toValidFileName(stable.getName() + ".sql"));
+			Window w = SwingUtilities.getWindowAncestor(this);
 			extractionModelFrame.setResultFileLoader(fileName -> {
-				Window w = SwingUtilities.getWindowAncestor(this);
-				if (!w.isVisible()) {
+				if (w == null || !w.isVisible()) {
 					return false;
 				}
 				loadScriptFile(fileName);
diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java b/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java
index 10b5f9b7a..71988ce7e 100644
--- a/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java
+++ b/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java
@@ -4670,7 +4670,7 @@ public class DataBrowser extends javax.swing.JFrame {
 				titleLbl.setToolTipText(null);
 			} else {
 				title = file.getName();
-				titleLbl.setToolTipText(file.getAbsolutePath());
+//	TODO			titleLbl.setToolTipText(file.getAbsolutePath());
 			}
 			if (dirty && file != null) {
 				titleLbl.setText("* " + title);