OC-1800 - Fix for ups when no rates available
Merge pull request #1731 from david-wm/OC-1800v2

OC-1800 - Fix for ups when no rates available