Remove NPE during session expiration