fallback: two fixes for raising ExtraData