CDB-2566 fixed a spec, plus commented two exceptions to avoid problems (sic) although they will still log errors.