Fixed: call to equals using different types
Fixed a possible NPE found by FindBugs