This fixes #7685.  It was a generic problem where the table wasn't in the database, so it returned null, rather than the default table.