Add more error handling for column-based changes