Added checks for data retrieved from Web