Fix for cases when tables are not defined
Merge pull request #21 from mmicko/master

Fix for cases when tables are not defined