diff --git a/plugins/geocoder_handler/google.inc b/plugins/geocoder_handler/google.inc
index 1ae0e4c..2ae2b58 100644
--- a/plugins/geocoder_handler/google.inc
+++ b/plugins/geocoder_handler/google.inc
@@ -48,6 +48,9 @@ function geocoder_google($address, $options = array()) {
$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')) {

@@ -57,6 +60,9 @@ function geocoder_google($address, $options = 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.
@@ -67,7 +73,14 @@ function geocoder_google($address, $options = array()) {
$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';