only os.Exits on error
Merge pull request #1837 from dotcloud/fix-tests-1812

only os.Exits on error