minor error control tweaks

nothing major