Made the JSON representation of Service complete and checked for nulls when deserializing