More protection to UI errors, pending general refactor.