fix DAO NPE + jxrs crosscontext