Modify to add Retry button on error dialog