Fixed Potential null pointer access and fixed the wrong commentary at
the classes.