diff --git includes/errors.inc includes/errors.inc
index f26319d..7b7a2d4 100644
--- includes/errors.inc
+++ includes/errors.inc
@@ -105,7 +105,7 @@ function _drupal_decode_exception($exception) {
     // or in one of its global functions.
     $db_functions = array('db_query',  'db_query_range');
     while (!empty($backtrace[1]) && ($caller = $backtrace[1]) &&
-        ((isset($caller['class']) && (strpos($caller['class'], 'Query') !== FALSE || strpos($caller['class'], 'Database') !== FALSE || strpos($caller['class'], 'PDO') !== FALSE)) ||
+        ((isset($caller['class']) && (strpos($caller['class'], 'Query') !== FALSE || strpos($caller['class'], 'Database') !== FALSE || strpos($caller['class'], 'PDO') !== FALSE || in_array('SelectQueryInterface', class_implements($caller['class'])))) ||
         in_array($caller['function'], $db_functions))) {
       // We remove that call.
       array_shift($backtrace);