* fix: npe when current claims is null eror was Object.getClass()" because "current" is null * style: fix