Incorporate some review feedback: insert missing @Override's, validate correct behavior in null pointer case.