Put the validation in the commit 0924028583d91476b416a9fdc8fb390d0cb0faa2