null pointer avoidance

I am not sure why this class got touched. You can fix that by checking out the current class from master