Few minor changes

Added a try catch in a table method. I should probably do this elsewhere
as well.