Better validation.
0.1.2