diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
index 544debf..b27144e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/EcoreSchemaBuilder.java
@@ -284,8 +284,9 @@
   protected String transformDefaultValue(XSDSimpleTypeDefinition xsdSimpleTypeDefinition, String defaultValue)
   {
     XSDSimpleTypeDefinition primitiveTypeDefinition = xsdSimpleTypeDefinition.getPrimitiveTypeDefinition();
-    if (primitiveTypeDefinition.hasNameAndTargetNamespace("float", defaultXMLSchemaNamespace) ||
-          primitiveTypeDefinition.hasNameAndTargetNamespace("double", defaultXMLSchemaNamespace))
+    if (primitiveTypeDefinition != null && 
+          (primitiveTypeDefinition.hasNameAndTargetNamespace("float", defaultXMLSchemaNamespace) ||
+             primitiveTypeDefinition.hasNameAndTargetNamespace("double", defaultXMLSchemaNamespace)))
     {
       if ("Infinity".equals(defaultValue))
       {