Added file name and error dialogs