Few minor fixes to using-nil situations when erroring, discovered when first setting up BRA.