Fixed NPE?

Maybe