1 files changed, 13 insertions, 10 deletions
diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
index c4a81bb06d8d..7b30a94b3293 100755
--- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
@@ -70,18 +70,21 @@ public class ModuleUIConfigurationManager extends TestCase {
      */
     protected void cleanup(TestParameters tParam, PrintWriter log) {
         log.println("    disposing xTextDoc ");
-
-        try {
-            XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
-                                                XCloseable.class, xTextDoc);
-            closer.close(true);
-        } catch (com.sun.star.util.CloseVetoException e) {
-            log.println("couldn't close document");
-        } catch (com.sun.star.lang.DisposedException e) {
-            log.println("couldn't close document");
+        if (xTextDoc != null) {
+            try {
+                XCloseable closer = (XCloseable) UnoRuntime.queryInterface(
+                    XCloseable.class, xTextDoc);
+                closer.close(true);
+            } catch (com.sun.star.util.CloseVetoException e) {
+                log.println("couldn't close document");
+            } catch (com.sun.star.lang.DisposedException e) {
+                log.println("couldn't close document");
+            }
         }
         log.println("   disposing storage");
-        xStore.dispose();
+        if (xStore != null) {
+            xStore.dispose();
+        }
     }
 
     /**