Slightly better error handling on update