SOLR-3755: Adding more error handling.