Fixes #185
Merge branch 'builder-error-handling' into 2.0
Merge branch '2.0' of https://github.com/bigspring/monolith into 2.0