Add exception handling for TableFault