Add validation in models.
Fix mistake from earlier migration.