Update CirrusSearch

Adds better error handling and fixes some rare errors on update.

Change-Id: Ie21fb3527735be68bfbe0bf9e344ee409229288e