Merge "2nd attempt to fix crash when getting unavailable service"