Key classes generated for the purposes of addressing maps are accepting null values, which is not a valid use in most circumstances.

Examine whether we should be restricting all values to be non-null and if that is the case, enforce values as appropriate in the constructors, annotate getters as returning @NonNull.