Fix NPE, THANKS NOTCH