gui fix, npe fix