Render errors better on restart or alias delete errors
Merge branch 'master' into membership_plus_console