--- FM2SQL/Attic/DBBean.java	2004/10/19 11:12:19	1.36
+++ FM2SQL/Attic/DBBean.java	2004/10/29 10:28:10	1.37
@@ -378,7 +378,7 @@ public class DBBean
    *   Returns the result for select * from table
    *   with maxHits = 500 default value
    */
-  public Vector[] getQueryData(String table) throws SQLException, ParseException
+  public Vector[] getQueryData(String table) throws SQLException, ParseException,Exception
   {
 
     return getQueryData("SELECT * from " + quoteChar + table + quoteChar, maxHits);
@@ -389,7 +389,7 @@ public class DBBean
    *    Returns the result of the query
    *    or an Vector array of Vectors containing error messages
    */
-  public Vector[] getQueryData(String query, FM2SQL.ProgressDialog dialog, int maxHits) throws SQLException
+  public Vector[] getQueryData(String query, FM2SQL.ProgressDialog dialog, int maxHits) throws SQLException,Exception
   {
     long timeStart = System.currentTimeMillis();
     ResultSet resultSet = null;
@@ -458,7 +458,7 @@ public class DBBean
    *    Returns the result of the query
    *    or an Vector array of Vectors containing error messages
    */
-  public Vector[] getQueryData(String query, int maxHits) throws SQLException, ParseException
+  public Vector[] getQueryData(String query, int maxHits) throws SQLException, ParseException,Exception
   {
     long timeStart = System.currentTimeMillis();
     ResultSet resultSet = null;
@@ -719,7 +719,7 @@ public class DBBean
    *   with the numberOfHits as maximum
    * @return the result as an ResultSet object
   */
-  public ResultSet makeQuery(String query, int numberOfHits) throws SQLException
+  public ResultSet makeQuery(String query, int numberOfHits) throws SQLException,Exception
   {
     result = null;
     Statement stm = null;
@@ -757,9 +757,10 @@ public class DBBean
     } catch (Exception e)
     {
       // TODO remove
-      if (FM2SQL.fmInstance != null&&Convert.debug)
+      if (Convert.isGUI&&Convert.debug)
         FM2SQL.showErrorDialog("Error caught!! \n Query was  " + query + " \n", "Debug Info");
       e.printStackTrace();
+     throw e;
     }
 
     return result;