- Added error handling
- Update datatable initialization