Remove unnecessary var declaration
Fix finder Exception message
Fix expected exception messages in tests
Merge pull request #5138 from bcrowe/3.0-table

3.0 - Remove unnecessary var declaration