import com.quantum.sql.MultiSQLServer;
 import com.quantum.sql.SQLResultSetResults;
 import com.quantum.sql.SQLResults;
-import com.quantum.ui.dialog.ExceptionDisplayDialog;
+import com.quantum.ui.dialog.SQLExceptionDialog;
 import com.quantum.util.connection.ConnectionUtil;
 
 import org.eclipse.jface.wizard.WizardPage;
 
 /**
  * @author BC Holmes
- * @author Sirkware
  */
 public abstract class BaseSQLPage extends WizardPage implements SQLPage {
 
         super(pageName);
     }
     public boolean performFinish() {
+               Bookmark bookmark = this.results.getBookmark();
                try {
-                       Bookmark bookmark = this.results.getBookmark();
                        bookmark.addQuery(getQueryText());
                        SQLResults sqlResults = MultiSQLServer.getInstance().execute(bookmark, 
                                        this.connectionUtil.getConnection(bookmark, getShell()), getQueryText());
                        return sqlResults == null ? false : true;
                } catch (SQLException e) {
-                       ExceptionDisplayDialog.openError(getShell(), null, null, e);
+                       SQLExceptionDialog.openException(getShell(), bookmark, e);
                        return false;
                }
        }