A little bit of cleanup
Added error dialogs to dialog_subject