Move mandatory field check sooner