BugFix: check for empty entries in table