Clean up, improve exception dialogues