Fixed support for empty validator