Error handling, and build cleanup
4 files changed