Trying to fix #4166
Merge pull request #4322 from prometheansacrifice/FixUnhandledExistingPageBug

Attempting to fix #4166