Adding in empty checks in case pieces are missing in JSON string