diff --git a/db.class.php b/db.class.php
index d9531df..4eaf1a6 100644
--- a/db.class.php
+++ b/db.class.php
@@ -17,6 +17,7 @@ class DB
   public static $host = 'localhost';
   public static $encoding = 'latin1';
   public static $queryMode = 'queryAllRows'; //buffered, unbuffered, queryAllRows
+  public static $error_handler = 'meekrodb_error_handler';
   
   public static function get($dbName = '') {
     static $mysql = null;
@@ -290,14 +291,16 @@ class DB
     $result = $db->query($sql, $is_buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
     if (DB::$debug) $runtime = microtime(true) - $starttime;
     
-    $sqlShow = "$sql (" . ($is_buffered ? 'MYSQLI_STORE_RESULT' : 'MYSQLI_USE_RESULT') . ")";
     if (!$sql || $error = DB::checkError()) {
-      echo "ATTEMPTED QUERY: $sqlShow<br>\n";
-      echo "ERROR: $error<br>\n";
-      debug_print_backtrace();
-      die;
+      if (function_exists(DB::$error_handler)) {
+        call_user_func(DB::$error_handler, array(
+          'query' => $sql,
+          'error' => $error
+        ));
+      }
     } else if (DB::$debug) {
       $runtime = sprintf('%f', $runtime * 1000);
+      $sqlShow = "$sql (" . ($is_buffered ? 'MYSQLI_STORE_RESULT' : 'MYSQLI_USE_RESULT') . ")";
       echo "QUERY: $sqlShow [$runtime ms]<br>\n";
     }
     
@@ -482,4 +485,20 @@ class DBTransaction {
   
 }
 
+function meekrodb_error_handler($params) {
+  $out[] = "QUERY: " . $params['query'];
+  $out[] = "ERROR: " . $params['error'];
+  $out[] = "";
+  
+  if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+    echo implode("\n", $out);
+  } else {
+    echo implode("<br>\n", $out);
+  }
+  
+  debug_print_backtrace();
+  
+  die;
+}
+
 ?>
diff --git a/simpletest/BasicTest.php b/simpletest/BasicTest.php
index c7c4d05..559aae9 100644
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -1,4 +1,11 @@
 <?
+function new_error_callback($params) {
+  global $error_callback_worked;
+  
+  if (substr_count($params['error'], 'You have an error in your SQL syntax')) $error_callback_worked = 1;
+}
+
+
 class BasicTest extends SimpleTest {
   function __construct() {
     error_reporting(E_ALL);
@@ -95,6 +102,15 @@ class BasicTest extends SimpleTest {
     $results = DB::query("SELECT * FROM accounts WHERE username!=%s", "Charlie's Friend");
     $this->assert(count($results) === 2);
   }
+  
+  function test_5_error_handler() {
+    global $error_callback_worked;
+    
+    DB::$error_handler = 'new_error_callback';
+    DB::query("SELET * FROM accounts");
+    
+    $this->assert($error_callback_worked === 1);
+  }
 
 }