better error catching
Merge branch 'master' of github.com:ros-infrastructure/buildfarm