First pass at avoiding errors