Add empty page and timeout checks