--- old/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	2013-04-04 15:26:22.268612068 +0200
+++ new/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java	2013-04-04 15:26:22.220612067 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -128,13 +128,15 @@
     }
 
     private void build() {
-        for(Iterator<Service> itr=wsdlDocument.getDefinitions().services(); itr.hasNext(); )
+        for(Iterator<Service> itr=wsdlDocument.getDefinitions().services(); itr.hasNext(); ) {
             build(itr.next());
+        }
     }
 
     private void build(Service service) {
-        for( Iterator<Port> itr=service.ports(); itr.hasNext(); )
+        for( Iterator<Port> itr=service.ports(); itr.hasNext(); ) {
             build(itr.next() );
+        }
     }
 
     private void build(Port port) {
@@ -193,7 +195,7 @@
             outputMessage = operation.getOutput().resolveMessage(wsdlDocument);
         if(outputMessage != null){
             List<MessagePart> allParts = new ArrayList<MessagePart>(outputMessage.getParts());
-            if(options.additionalHeaders) {
+            if(options != null && options.additionalHeaders) {
                 List<MessagePart> addtionalHeaderParts = wsdlModeler.getAdditionHeaderParts(bindingOperation, outputMessage, false);
                 allParts.addAll(addtionalHeaderParts);
             }