Merge pull request #1617 from keneanung/OdbcCommandExceptionOnNoData