Bug fixes for pagination & unknown error response from API