diff --git a/base/src/org/compiere/util/DBException.java b/base/src/org/adempiere/exceptions/DBException.java
similarity index 95%
rename from base/src/org/compiere/util/DBException.java
rename to base/src/org/adempiere/exceptions/DBException.java
index c50c7a84b0..26efb62fa0 100644
--- a/base/src/org/compiere/util/DBException.java
+++ b/base/src/org/adempiere/exceptions/DBException.java
@@ -14,11 +14,10 @@
  * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
  * or via info@compiere.org or http://www.compiere.org/license.html           *
  *****************************************************************************/
-package org.compiere.util;
+package org.adempiere.exceptions;
 
 import java.sql.SQLException;
 
-import org.adempiere.exceptions.AdempiereException;
 
 /**
  * This RuntimeException is used to pass SQLException up the chain of calling
diff --git a/base/src/org/compiere/db/CreateAdempiere.java b/base/src/org/compiere/db/CreateAdempiere.java
index fc09e6880e..9ec79a730d 100644
--- a/base/src/org/compiere/db/CreateAdempiere.java
+++ b/base/src/org/compiere/db/CreateAdempiere.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Properties;
 import java.util.logging.Level;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.Adempiere;
 import org.compiere.model.MColumn;
 import org.compiere.model.MTable;
@@ -38,7 +39,6 @@ import org.compiere.model.M_Element;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
-import org.compiere.util.DBException;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Util;
 
diff --git a/base/src/org/compiere/db/DB_Oracle.java b/base/src/org/compiere/db/DB_Oracle.java
index ad45d2ebab..35942bc45e 100644
--- a/base/src/org/compiere/db/DB_Oracle.java
+++ b/base/src/org/compiere/db/DB_Oracle.java
@@ -31,12 +31,12 @@ import javax.sql.DataSource;
 
 import oracle.jdbc.OracleDriver;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.Adempiere;
 import org.compiere.dbPort.Convert;
 import org.compiere.dbPort.Convert_Oracle;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
-import org.compiere.util.DBException;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Ini;
 import org.compiere.util.Language;
diff --git a/base/src/org/compiere/model/GridTable.java b/base/src/org/compiere/model/GridTable.java
index 9c896baf31..e8173becaa 100644
--- a/base/src/org/compiere/model/GridTable.java
+++ b/base/src/org/compiere/model/GridTable.java
@@ -25,6 +25,7 @@ import java.util.logging.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.util.*;
 
 /**
diff --git a/base/src/org/compiere/model/MSequence.java b/base/src/org/compiere/model/MSequence.java
index 6eabc827bd..7db9fb1468 100644
--- a/base/src/org/compiere/model/MSequence.java
+++ b/base/src/org/compiere/model/MSequence.java
@@ -37,12 +37,12 @@ import java.util.Properties;
 import java.util.Vector;
 import java.util.logging.Level;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.db.CConnection;
 import org.compiere.interfaces.Server;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
-import org.compiere.util.DBException;
 import org.compiere.util.Env;
 import org.compiere.util.Ini;
 import org.compiere.util.Trx;
diff --git a/base/src/org/compiere/model/PO.java b/base/src/org/compiere/model/PO.java
index 76eb7a8275..e55daa5f94 100644
--- a/base/src/org/compiere/model/PO.java
+++ b/base/src/org/compiere/model/PO.java
@@ -40,13 +40,13 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.exceptions.DBException;
 import org.compiere.Adempiere;
 import org.compiere.acct.Doc;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.CacheMgt;
 import org.compiere.util.DB;
-import org.compiere.util.DBException;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Evaluatee;
diff --git a/base/src/org/compiere/model/POResultSet.java b/base/src/org/compiere/model/POResultSet.java
index 442ae23ae4..f9529adedd 100644
--- a/base/src/org/compiere/model/POResultSet.java
+++ b/base/src/org/compiere/model/POResultSet.java
@@ -22,8 +22,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.util.DB;
-import org.compiere.util.DBException;
 
 /**
  * Simple wrapper over jdbc resultset
diff --git a/base/src/org/compiere/model/Query.java b/base/src/org/compiere/model/Query.java
index 2927506e6f..bed49dd317 100644
--- a/base/src/org/compiere/model/Query.java
+++ b/base/src/org/compiere/model/Query.java
@@ -26,9 +26,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
-import org.compiere.util.DBException;
 import org.compiere.util.Env;
 
 /**
diff --git a/base/src/org/compiere/process/ImportReportLine.java b/base/src/org/compiere/process/ImportReportLine.java
index ebfa8122d2..b27784dc37 100644
--- a/base/src/org/compiere/process/ImportReportLine.java
+++ b/base/src/org/compiere/process/ImportReportLine.java
@@ -19,6 +19,8 @@ package org.compiere.process;
 import java.math.*;
 import java.sql.*;
 import java.util.logging.*;
+
+import org.adempiere.exceptions.DBException;
 import org.compiere.util.*;
 
 /**
diff --git a/base/src/org/compiere/util/CCallableStatement.java b/base/src/org/compiere/util/CCallableStatement.java
index 0c17318a7e..d91bd96603 100644
--- a/base/src/org/compiere/util/CCallableStatement.java
+++ b/base/src/org/compiere/util/CCallableStatement.java
@@ -36,6 +36,7 @@ import java.util.Calendar;
 import java.util.Map;
 import java.util.logging.Level;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.db.CConnection;
 import org.compiere.interfaces.Server;
 
diff --git a/base/src/org/compiere/util/CPreparedStatement.java b/base/src/org/compiere/util/CPreparedStatement.java
index 729dd15d11..94d1b4eeda 100644
--- a/base/src/org/compiere/util/CPreparedStatement.java
+++ b/base/src/org/compiere/util/CPreparedStatement.java
@@ -25,6 +25,7 @@ import java.util.logging.*;
 
 import javax.sql.*;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.db.*;
 import org.compiere.interfaces.*;
 
diff --git a/base/src/org/compiere/util/CStatement.java b/base/src/org/compiere/util/CStatement.java
index 54b3b88756..e10db4ec2a 100644
--- a/base/src/org/compiere/util/CStatement.java
+++ b/base/src/org/compiere/util/CStatement.java
@@ -21,6 +21,7 @@ import java.util.logging.*;
 
 import javax.sql.*;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.db.*;
 import org.compiere.interfaces.*;
 
diff --git a/base/src/org/compiere/util/DB.java b/base/src/org/compiere/util/DB.java
index 232ade2766..ca7c4d114c 100644
--- a/base/src/org/compiere/util/DB.java
+++ b/base/src/org/compiere/util/DB.java
@@ -38,6 +38,7 @@ import javax.sql.RowSet;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.Adempiere;
 import org.compiere.db.AdempiereDatabase;
 import org.compiere.db.CConnection;
diff --git a/extend/src/test/functional/QueryTest.java b/extend/src/test/functional/QueryTest.java
index b3b40358b7..c51d69b241 100644
--- a/extend/src/test/functional/QueryTest.java
+++ b/extend/src/test/functional/QueryTest.java
@@ -6,10 +6,10 @@ package test.functional;
 import java.util.Iterator;
 import java.util.List;
 
+import org.adempiere.exceptions.DBException;
 import org.compiere.model.MTable;
 import org.compiere.model.POResultSet;
 import org.compiere.model.Query;
-import org.compiere.util.DBException;
 
 import test.AdempiereTestCase;