Safe commit. Ealier validation too complex