Clean up error handling on builds