UI Exception Handling Fixes