correct & tighten err returns