Added check for None table item