etcdmain: actually return errors
Merge pull request #1680 from jonboulle/fix_errors

etcdmain: actually return errors