add null check for page change listener
add null check for page change listener