Fix NPE Error...
Oh yeah, I have a build error too but I didnt pushed git yet. Hold on