diff --git a/runtime/src/com/sun/xml/bind/v2/runtime/XMLSerializer.java b/jaxb-ri/runtime/src/com/sun/xml/bind/v2/runtime/XMLSerializer.java
index b4e855d..6308b86 100644
--- a/runtime/src/com/sun/xml/bind/v2/runtime/XMLSerializer.java
+++ b/runtime/src/com/sun/xml/bind/v2/runtime/XMLSerializer.java
@@ -322,7 +322,8 @@ public final class XMLSerializer extends Coordinator {
             nse = nse.push();
             out.beginStartTag(tagName);
             out.endStartTag();
-                        out.text(data,false);
+            if(data != null)
+                out.text(data,false);
             out.endTag(tagName);
             nse = nse.pop();
         } else {
@@ -342,6 +343,7 @@ public final class XMLSerializer extends Coordinator {
             nse = nse.push();
             out.beginStartTag(tagName);
             out.endStartTag();
+            if(data != null)
                 out.text(data,false);
             out.endTag(tagName);
             nse = nse.pop();