Added check for empty tables.
Merge branch 'refs/heads/development'