Fixing service NPE from analysis refactor PR.

TBR @srsaroop 
Fixes #1183