Relocate dropped col handling, simplifying error messages