handle error if default page is not found
Merging in master.