BUGFIXED: IRIS throwing ClassCastException if entity key type is null