1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index cb7167b1e090..67432ac1163b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -140,7 +140,7 @@ public final class PluginFactoryImpl extends PluginFactory
         try {
             props.load(is);
 
-            String info = props.getProperty(mimeType);
+            String info = mimeType != null ? props.getProperty(mimeType) : null;
             if (info != null) {
                 ext = info;
             }
@@ -171,4 +171,4 @@ public final class PluginFactoryImpl extends PluginFactory
         DocumentMergerImpl merger = new DocumentMergerImpl(doc, cc);
         return merger;
     }
-}
-\ No newline at end of file
+}