diff --git a/alexa.module b/alexa.module
index 156b49a..74aeb93 100644
--- a/alexa.module
+++ b/alexa.module
@@ -21,8 +21,8 @@ function alexa_menu() {
   );
 
   $items['admin/config/services/alexa'] = array(
-    'title' => 'Alexa Configuration',
-    'description' => 'Manage Application IDs for Alexa Skills',
+    'title' => 'Alexa',
+    'description' => 'Manage configuration for Alexa Skills integration.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('alexa_form'),
     'access arguments' => array('administer alexa configuration'),
@@ -70,6 +70,13 @@ function alexa_form($form, &$form_state) {
     '#default_value' => variable_get('alexa_application_id', ''),
   );
 
+  $form['alexa_dev_mode'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Development mode'),
+    '#description' => t('Skip certificate validation, so the request will be always accepted. Useful during development, MUST BE DISABLED for production environment.'),
+    '#default_value' => variable_get('alexa_dev_mode', 0),
+  );
+
   return system_settings_form($form);
 }
 
@@ -114,14 +121,10 @@ function _alexa_handle_callback() {
     }
 
     // Output the response.
+    drupal_add_http_header('Status', '200 OK');
     if ($response && !empty($response->outputSpeech)) {
-      print json_encode($response->render());
-
-      drupal_add_http_header('Status', '200 OK');
       drupal_add_http_header('Content-type', 'application/json');
-    }
-    else {
-      drupal_add_http_header('Status', '500 Internal Server Error');
+      print json_encode($response->render());
     }
   }
   catch (Exception $e) {
diff --git a/includes/AlexaCachedCertificate.inc b/includes/AlexaCachedCertificate.inc
index 9b731c0..265c61f 100644
--- a/includes/AlexaCachedCertificate.inc
+++ b/includes/AlexaCachedCertificate.inc
@@ -31,4 +31,13 @@ class AlexaCachedCertificate extends Certificate {
     return $certificate;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function validateRequest($requestData) {
+    if (!variable_get('alexa_dev_mode', FALSE)) {
+      parent::validateRequest($requestData);
+    }
+  }
+
 }