1 files changed, 5 insertions, 1 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index b549743fe308..de377ec43f37 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -153,6 +153,10 @@ public class ConverterInfo {
         String version, String vendor, String impl)
         throws RegistryException {
 
+        if (officeMime == null || displayName == null || description == null ||
+            version    == null || vendor      == null || impl        == null)
+          throw new IllegalArgumentException("arguments unexpected null");
+
         if (!isValidOfficeType(officeMime.trim())) {
             RegistryException re = new RegistryException(
                 "Invalid office type");
@@ -387,4 +391,4 @@ public class ConverterInfo {
     public String getXsltDeserial() {
         return piXsltDeserial;
     }
-}
-\ No newline at end of file
+}