Added checks for page variables
Added checks for page variables