Fixed additional potential crashes while handling paging