Add safety checks before updating columns