DERBY-6660: ResultSet assertion methods fail in upgrade tests

If an error happens in addRsToReport(), don't let it shadow the
original error.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1610412 13f79535-47bb-0310-9956-ffa450edef68