Merge "Catch the RuntimeException for stopScan()"