Added column exists check