Better error message if service name guessing fails

And soft-space indenting