Had the _fetch_xform() function return an explcit value, and deliberately separated the xform is None branch from everything else
Added one more explicit trap for the xform.user, since it continues to trigger an error in the tests