I just copied the code from the method above, i can see what you mean that could cause a npe at this location, i will fix it here, do you also want me to fix the other methods above?