Clean up the use of the DTO to compensate for nulls that may sneak into collections via gson handling of json collections that have a trailing comma