Updated to re throw validation exceptions