This was breaking when service was None. Now it doesn't.
This was breaking when service was None. Now it doesn't.

gstarnberger/paasta,somic/paasta,Yelp/paasta,gstarnberger/paasta,somic/paasta,Yelp/paasta