Data Scraping - Using multiple pages causes crash if filter returns only one page

Scenario:

Data Scraping from web page - I tell the wizard the data spans multiple pages, and highlight the “next” button to use. This works fine if the give search criteria returns multiple pages, but if the results only span one page (and therefore the ‘next’ button doesn’t appear) - the program throws an error because it can’t find the selector.

Steps to reproduce:

Do a data scrape on “http://www.daft.ie/” and allow multiple pages.
First set a wide criteria, eg Commercial Property in Dublin City - All Types (multiple pages): WORKS
Then try a narrow criteria, eg Commercial Property in Dublin 4 - Industrial Unit To Let (one page): DIES

Current Behavior:

Dies if the ‘next’ button is not displayed on the page

Expected Behavior:

Will ignore the requirement for ‘next’ button if the filtered data occupies only on one page

Studio/Robot/Orchestrator Version:

Last stable behavior: 2017.1.6435
Last stable version: 2017.1.6435
OS Version: Windows 10, version 1703, OS Version 15063.608
Others if Relevant: (workflow, logs, .net version, service pack, etc): Running on surface pro, touch screen, 64-bit OS, x-64 based processor

No-one else?