In certain cases you need to protect from possible bugs here. This is what these changes do.
Improves indentation
Use real description for "Carrier Shipment Method" instead of only ID

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1608526 13f79535-47bb-0310-9956-ffa450edef68