Added SafeValidator.