#26 fixed NPE in SP change token