Added an error checker to tableView
Merge remote-tracking branch 'master/master'
Added an error checker to tableView