added safe validator