Tighten up error controls.