Added getCurrent() != null check [ci skip]