Fix a null pointer exception when delivery service doesn't exist (#6153)

* Fix a null pointer exception when delivery service doesn't exist

* Fixing white spaces

* Fixes tab

* Removing space and adding tabs

Co-authored-by: Steve Malenfant <steve.malenfant@cox.com>
(cherry picked from commit a4334ad4a65d3a43463ad23142241957fc72c581)
1 file changed