Fixed potential dereferencing of a null value reported by FindBugs.
Removed unused field reported by FindBugs (never written).