Index: C:/Java/castor-2/src/doc/release-notes.xml
===================================================================
--- C:/Java/castor-2/src/doc/release-notes.xml	(revision 6059)
+++ C:/Java/castor-2/src/doc/release-notes.xml	(working copy)
@@ -134,7 +134,27 @@
                    
             </summary>
             <bugs>
-				<bug id="1482" tool="jira">
+                <bug id="1483" tool="jira">
+                    <description>
+		                Fixed NullPointerException at generation of mapping.
+                    </description>
+                    <contributor>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon-world.de</email>
+                    </contributor>
+                    <submitter>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon-world.de</email>
+                    </submitter>
+                    <reporter>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon-world.de</email>
+                    </reporter>
+                    <type>Bug</type>
+                    <module>XML</module>
+                    <date>20060801</date>
+                </bug>
+                <bug id="1482" tool="jira">
                     <description>
 		                Fixed problem related to MapItem class and namespaces.
                     </description>
@@ -154,7 +174,7 @@
                     <module>XML</module>
                     <date>20060801</date>
                 </bug>
-				 <bug id="1484" tool="jira">
+                <bug id="1484" tool="jira">
                     <description>
 		                Seperated responsibilities of AbstractMappingLoader for holding its
 						current state and generation of descriptors.
@@ -175,7 +195,7 @@
                     <module>All</module>
                     <date>20060731</date>
                 </bug>
-				<bug id="721" tool="jira">
+                <bug id="721" tool="jira">
                     <description>
 		                Added validation of min/maxLength facets for xs:NMTOKEN
                     </description>
@@ -195,7 +215,7 @@
                     <module>XML</module>
                     <date>20060726</date>
                 </bug>
-				<bug id="721" tool="jira">
+                <bug id="721" tool="jira">
                     <description>
 		                Fixed problem with support for final modifier at the class level during source generation.
                     </description>
Index: C:/Java/castor-2/src/etc/CHANGELOG
===================================================================
--- C:/Java/castor-2/src/etc/CHANGELOG	(revision 6059)
+++ C:/Java/castor-2/src/etc/CHANGELOG	(working copy)
@@ -2,6 +2,11 @@
 Version 1.0.2, Aug 3, 2006
 -------------------------------
 
+XML:   Resolved issue CASTOR-1483 using contribution from Ralf Joachim [ralf.joachim@syscon-world.de]
+       Fixed NullPointerException at generation of mapping.
+       Details: http://jira.codehaus.org/browse/CASTOR-1483
+       (Ralf - 20060801)
+
 XML:   Fixed bug CASTOR-1482 using contribution from Werner Guttmann [werner.guttmann@gmx.net]
        Fixed problem related to MapItem class and namespaces
        Details: http://jira.codehaus.org/browse/CASTOR-1482
Index: C:/Java/castor-2/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java
===================================================================
--- C:/Java/castor-2/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java	(revision 6059)
+++ C:/Java/castor-2/src/main/java/org/exolab/castor/builder/binding/XMLBindingComponent.java	(working copy)
@@ -1200,7 +1200,7 @@
      */
     public String getCollectionType() {
         String result = null;
-        if (_type == MEMBER) {
+        if ((_type == MEMBER) && (_member.getCollection() != null)) {
             result = _member.getCollection().toString();
         }
         return result;