More strictly check res.body before mixing in conn id
More strictly check res.body before mixing in conn id

karimmtarek/pakyow,jphager2/pakyow,jphager2/pakyow,jphager2/pakyow,karimmtarek/pakyow,karimmtarek/pakyow