Handle a missing apiserver flag better.
Merge pull request #2844 from brendandburns/fix

Handle a missing apiserver flag better.