Save Failed assertion failed and small cleanups in error annotations.

A couple of fixes for error annotations.

No test since this is purely UI stuff.