Handle gracefully if Solr is not running

Change-Id: I3cc00721a21290514861e4a34f88c7873b8f189b
Merge "Handle gracefully if Solr is not running"