EB-8732 -Null pointer fix for Punch out customer
Merge branch 'P1_EB8372' into prodsupport