Deal with pagination errors in a consistant manner.

Code that wasn't fixed here is depreciated and will be removed in later
commit.

Change-Id: Ibb7e0551359c09bfc1ee9f539ccf5bffe6cd69d6