Fixed bug with nulls coming from web service