Fixed some error messages to be a bit more accurate.
Reworked the builder to work in a few different steps to resolve BZ#985154 and BZ#911435.