better error messages
Merge branch 'develop' of github.com:teharrison/pipeline into develop