Index: src/com/metamatrix/modeler/modelgenerator/wsdl/SOAPConnectionInfoProvider.java =================================================================== --- src/com/metamatrix/modeler/modelgenerator/wsdl/SOAPConnectionInfoProvider.java (revision 1894) +++ src/com/metamatrix/modeler/modelgenerator/wsdl/SOAPConnectionInfoProvider.java (working copy) @@ -62,7 +62,10 @@ Properties props = connectionProfile.getBaseProperties(); - connectionProps.put(CONNECTION_NAMESPACE + SOURCE_ENDPOINT, modelResource.getModelAnnotation().getNameInSource()); + String nameInSource = modelResource.getModelAnnotation().getNameInSource(); + if (nameInSource != null) { + connectionProps.put(CONNECTION_NAMESPACE + SOURCE_ENDPOINT, nameInSource); + } if (props.getProperty(SOAP_ENDPOINT_KEY) != null) { connectionProps.put(CONNECTION_NAMESPACE + DS_ENDPOINT, props.getProperty(SOAP_ENDPOINT_KEY));