am ba6747f1: Scan failure still means we finished scan.

* commit 'ba6747f119811032b258cf3c6334a4d0f9b675bf':
  Scan failure still means we finished scan.