More inline validation work, and better error logging in analytics.