Add @Override and fix a possible NPE.
Add @Override.