Index: branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java
===================================================================
diff -u -r256121 -r256209
--- branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java	(.../LocateProductServiceV4Impl.java)	(revision 256121)
+++ branches/APG_ES_Product/Java/nsight-product-availability/src/main/java/com/genpt/nsight/v4/service/impl/LocateProductServiceV4Impl.java	(.../LocateProductServiceV4Impl.java)	(revision 256209)
@@ -423,6 +423,9 @@
                                             else
                                             	fulfillment.setCountry("Not Available");
                                             
+                                            fulfillment.setAddress1("-");
+                                            fulfillment.setAddress2("");
+                                            
                                             if (availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()) {
                                                 Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                 fulfillment.setDelivery(delivery);
@@ -462,6 +465,9 @@
                                             else
                                             	fulfillment.setCountry("Not Available");
                                             
+                                            fulfillment.setAddress1("-");
+                                            fulfillment.setAddress2("");
+                                            
                                             if (availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()) {
                                                 Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                 fulfillment.setDelivery(delivery);
@@ -501,6 +507,9 @@
                                             else
                                             	fulfillment.setCountry("Not Available");
                                             
+                                            fulfillment.setAddress1("-");
+                                            fulfillment.setAddress2("");
+                                            
                                             if(availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()){
                                                 Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                 fulfillment.setDelivery(delivery);
@@ -550,6 +559,9 @@
                                                 else
                                                 	fulfillment.setCountry("Not Available");
                                                 
+                                                fulfillment.setAddress1("-");
+                                                fulfillment.setAddress2("");
+                                                
                                                 if(availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()){
                                                     Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                     fulfillment.setDelivery(delivery);
@@ -582,6 +594,9 @@
                                                 else
                                                 	fulfillment.setCountry("Not Available");
                                                 
+                                                fulfillment.setAddress1("-");
+                                                fulfillment.setAddress2("");
+                                                
                                                 if(availabilityServiceContextV4.getRequestMajorAccounts().getAction().getNeedDeliveryInformation()){
                                                     Delivery delivery = addDeliveryInformation(site, availabilityServiceContextV4, beginningOfDay);
                                                     fulfillment.setDelivery(delivery);
@@ -900,6 +915,9 @@
         else
         	fulfillment.setCountry("Not Available");
         
+        fulfillment.setAddress1("-");
+        fulfillment.setAddress2("");
+        
         if (needDeliveryInformation) {
             Delivery delivery = new Delivery();
             String localDateTimeInUTC = LocalDateTime.ofInstant(Instant.now(),ZoneId.systemDefault()).toString();