Index: GoogleMini.php
===================================================================
--- GoogleMini.php	(revision 356)
+++ GoogleMini.php	(working copy)
@@ -69,7 +69,7 @@
    */
   public function addMetaDataFilter($key, $values, $type = 'partialfields', $join = 'OR') {
     if (!in_array($type, array('partialfields', 'requiredfields'))) {
-      throw new GoogleMiniCriteriaException("You must provide a type of either partialfields or requiredfields", '-99');
+      throw new GoogleMiniException("You must provide a type of either partialfields or requiredfields", '-99');
     }
     if (is_array($values)) {
       $this->_metaDataFilters[$type][$key] = new stdClass();
@@ -156,10 +156,10 @@
    */
   public function setDateSort($dir = "D", $mode = 'S') {
       if ($dir != 'A' && $dir != 'D') {
-        throw new GoogleMiniCriteriaException(sprintf("The Sort direction provided is incorrect.  Got %s, needs to be A or D", htmlentities($dir)), E_WARNING);
+        throw new GoogleMiniException(sprintf("The Sort direction provided is incorrect.  Got %s, needs to be A or D", htmlentities($dir)), E_WARNING);
       }
       if ($mode != 'S' && $mode != 'R') {
-        throw new GoogleMiniCriteriaException(sprintf("The Sort mode provided is incorrect.  Got %s, needs to be S or R", htmlentities($mode)), E_WARNING);
+        throw new GoogleMiniException(sprintf("The Sort mode provided is incorrect.  Got %s, needs to be S or R", htmlentities($mode)), E_WARNING);
       }
 
       // build sort string
@@ -203,7 +203,7 @@
   public function setPageAndResultsPerPage($page = 0, $results = 10) {
     $end = $page * $results + $results;
     if ($end > GOOGLE_MINI_MAX_RESULTS) {
-      throw new GoogleMiniCriteriaException("You cannot get more than ".GOOGLE_MINI_MAX_RESULTS." results per page, requested $end", 2);
+      throw new GoogleMiniException("You cannot get more than ".GOOGLE_MINI_MAX_RESULTS." results per page, requested $end", 2);
     }
     $this->setQueryPart('start', $page * $results);
     $this->setQueryPart('num', $results);
@@ -236,7 +236,7 @@
 
   public function buildQuery() {
      if (!$this->baseUrl || !$this->collection) {
-      throw new GoogleMiniQueryException("Required variables (baseUrl or collection) missing", E_WARNING);
+      throw new GoogleMiniException("Required variables (baseUrl or collection) missing", E_WARNING);
     }
 
     if (count($this->_metaDataFilters)) {
@@ -335,7 +335,7 @@
     
     if ($totalResults == 0) {
       if (!$payload->GM) {
-        throw new GoogleMiniResultException(t("No Results found"), '1');
+        throw new GoogleMiniException(t("No Results found"), '1');
       }
     }
     else {
@@ -428,17 +428,6 @@
 }
 
 
-class GoogleMiniQueryException extends GoogleMiniException {
-
-}
-class GoogleMiniCriteriaException extends GoogleMiniException {
-
-}
-
-class GoogleMiniResultException extends GoogleMiniException {
-  var $log_messages = array();
-}
-
 class GoogleMiniException extends Exception {
   
   function __construct($message, $code = null) {
Index: tests/googlemini.test
===================================================================
--- tests/googlemini.test	(revision 356)
+++ tests/googlemini.test	(working copy)
@@ -37,9 +37,7 @@
       $query = "sjahdkjsadhsakjdhsakjdlakdjsahdlkjsasdhsad";
       $g->setKeywords($query);
       $result = $g->query();            
-    } catch (GoogleMiniCriteriaException $e) {
-      
-    } catch (GoogleMiniResultException $e) {
+    } catch (GoogleMiniException $e) {
       if ($e->getCode() ==1 ) {
         $this->assertEqual(true,true,"The Query $query fired a no results exception.  (good)");
       }
@@ -54,10 +52,8 @@
       $g->setKeywords($query);
       $result = $g->query();      
       $this->assertNotEqual($result->totalResults,0,"The Query $query did not return 0 results");
-    } catch (GoogleMiniCriteriaException $e) {
+    } catch (GoogleMiniException $e) {
       
-    } catch (GoogleMiniResultException $e) {
-      
     }
   }
   
@@ -79,10 +75,8 @@
         $result = $g->query();
               
         $this->assertNotEqual($result->totalResults,0,"The Query $query did not return 0 results");
-      } catch (GoogleMiniCriteriaException $e) {
+      } catch (GoogleMiniException $e) {
         
-      } catch (GoogleMiniResultException $e) {
-        
       }
     
     }
Index: google_appliance.module
===================================================================
--- google_appliance.module	(revision 356)
+++ google_appliance.module	(working copy)
@@ -901,7 +901,7 @@
       }
     }
   }
-  catch (GoogleMiniCriteriaException $e) {
+  catch (GoogleMiniException $e) {
     $code = $e->getCode();
     if ($message = variable_get('google_appliance_errorcode_'. $code, '')) {
       $user_message = $message;