Validation exceptions handling, better cleaning