diff --git a/autoload.php b/autoload.php
index 8a76529..8d51708 100644
--- a/autoload.php
+++ b/autoload.php
@@ -35,6 +35,7 @@ define('QDRIVER_PATH', QBASE_PATH.'drivers/');
 
 // Require some common functions
 require(QBASE_PATH.'common.php');
+require(QBASE_PATH.'core/BadDBDriverException.php');
 
 // Load Query Classes
 spl_autoload_register(function ($class)
diff --git a/core/BadDBDriverException.php b/core/BadDBDriverException.php
new file mode 100644
index 0000000..4deac5b
--- /dev/null
+++ b/core/BadDBDriverException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @package		Query
+ * @author		Timothy J. Warren
+ * @copyright	Copyright (c) 2012 - 2014
+ * @link 		https://github.com/aviat4ion/Query
+ * @license		http://philsturgeon.co.uk/code/dbad-license
+ */
+
+// --------------------------------------------------------------------------
+
+namespace Query;
+
+/**
+ * Generic exception for bad drivers
+ *
+ * @package Query
+ * @subpackage Core
+ */
+class BadDBDriverException extends \InvalidArgumentException {}
+
+// End of BadDBDriverException.php
\ No newline at end of file
diff --git a/core/abstract/abstract_driver.php b/core/abstract/abstract_driver.php
index 6ef523f..3094d72 100644
--- a/core/abstract/abstract_driver.php
+++ b/core/abstract/abstract_driver.php
@@ -15,8 +15,6 @@
 
 namespace Query\Driver;
 
-use Query\Table\Table_Builder;
-
 // --------------------------------------------------------------------------
 
 /**
diff --git a/core/connection_manager.php b/core/connection_manager.php
index 3b35b38..914dad3 100644
--- a/core/connection_manager.php
+++ b/core/connection_manager.php
@@ -15,16 +15,6 @@
 
 namespace Query;
 
-/**
- * Generic exception for bad drivers
- *
- * @package Query
- * @subpackage Core
- */
-class BadDBDriverException extends \InvalidArgumentException {}
-
-// --------------------------------------------------------------------------
-
 /**
  * Connection manager class to manage connections for the
  * Query method