Started new anti-null policy by adding null checks to couple methods.

Moving away from explicit this and super