Gracefully handle no service set (fixes GH-1213)