SOLR-6095 Uncaught Exception causing test failures

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1603468 13f79535-47bb-0310-9956-ffa450edef68