Bug fix to handle null SkipToPage