Add error handling, use updated AMU model for Persons.