1 files changed, 4 insertions, 1 deletions
diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index ae2cae058667..da99d0d1922e 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -67,7 +67,10 @@ public final class OfficeConnection {
                 "--accept=" + description + ";urp",
                 "-env:UserInstallation=" + Argument.get("user"),
                 "-env:UNO_JAVA_JFW_ENV_JREHOME=true");
-            pb.directory(new File(Argument.get("workdir")));
+            String workdirArg = Argument.get("workdir");
+            if (workdirArg != null) {
+                pb.directory(new File(workdirArg));
+            }
             String envArg = Argument.get("env");
             if (envArg != null) {
                 Map<String, String> env = pb.environment();