UI error handling fix