added table-manager
improved error catching