Move machine validation to machine add controller