Properly handle return value from Setup
Merge branch 'master' of github.com:phedny/CouchEye