forgot to handle nulls in toBuilder()...