fix missing and short-circuited validation