Error handling update, new arch.