Better checking for builder error