diff --git a/plugins/geocoder_handler/google.inc b/plugins/geocoder_handler/google.inc
index 1ae0e4c..03a122c 100644
--- a/plugins/geocoder_handler/google.inc
+++ b/plugins/geocoder_handler/google.inc
@@ -47,27 +47,38 @@ function geocoder_google($address, $options = array()) {
   if (!empty($options['biasing']['components'])) {
     $query['components'] = $options['biasing']['components'];
   }
+  // Error message in case no key/client ID has been provided.
+  $msg = t('The current HTTP request to google API does not have a key or client ID to identify your application.');
 
   // Add Google API authentication parameters.
   switch (variable_get('geocoder_google_auth_method')) {
 
     // Google Geocoding API Key.
-  case GEOCODER_GOOGLE_AUTH_KEY:
-    $geocoder_settings = variable_get("geocoder_settings", array());
-    if (!empty($geocoder_settings['geocoder_apikey_google'])) {
-      $query['key'] = $geocoder_settings['geocoder_apikey_google'];
-    }
-    break;
+    case GEOCODER_GOOGLE_AUTH_KEY:
+      $geocoder_settings = variable_get("geocoder_settings", array());
+      if (!empty($geocoder_settings['geocoder_apikey_google'])) {
+        $query['key'] = $geocoder_settings['geocoder_apikey_google'];
+      }
+      else {
+        throw new Exception($msg, WATCHDOG_ERROR);
+      }
+      break;
 
     // Google Maps for Work signature.
-  case GEOCODER_GOOGLE_AUTH_WORK:
-    $client_id   = variable_get('geocoder_google_client_id', FALSE);
-    $private_key = variable_get('geocoder_google_private_key', FALSE);
-    if (!empty($client_id) && !empty($private_key)) {
-      $google_maps_for_work = TRUE;
-      $query['client']      = $client_id;
-    }
-    break;
+    case GEOCODER_GOOGLE_AUTH_WORK:
+      $client_id = variable_get('geocoder_google_client_id', FALSE);
+      $private_key = variable_get('geocoder_google_private_key', FALSE);
+      if (!empty($client_id) && !empty($private_key)) {
+        $google_maps_for_work = TRUE;
+        $query['client'] = $client_id;
+      }
+      else {
+        throw new Exception($msg, WATCHDOG_ERROR);
+      }
+      break;
+
+    default:
+      throw new Exception($msg, WATCHDOG_ERROR);
   }
 
   $google_url = 'https://maps.googleapis.com/maps/api/geocode/json';