Fixed base equality and prevented NPE, also removed redundant check from
subclasses