Fixed bug where validations did not handle options marked for destruction correctly.