Handle build errors more neatly