Revert "builder simplified"

This reverts commit 6dca86f475f793b8375c13ffce9ed129c6b0a1f5.
better build error checking