Fix NPEs
Drop the table if it doesn't have the column