TEIIDDES-2103: Fixes incorrect hash code calculation

Does this address the NPE in TEIIDDES-2103??