TODO: configure AutoMapper to deal with nulls