Better validate

cc @willwhite