Validator now throw exceptions if something goes wrong
Fixed merge conflicts