diff --git a/webform.module b/webform.module
index 973fd65..f360d5e 100644
--- a/webform.module
+++ b/webform.module
@@ -378,6 +378,37 @@ function webform_menu() {
     'file' => 'includes/webform.submissions.inc',
     'type' => MENU_CALLBACK,
   );
+  // Devel intergration for submissions.
+  if (module_exists('devel')) {
+    $items['node/%webform_menu/submission/%webform_menu_submission/devel'] = array(
+      'title' => 'Devel',
+      'load arguments' => array(1),
+      'page callback' => 'devel_load_object',
+      'page arguments' => array('submission', 3),
+      'access arguments' => array('access devel information'),
+      'type' => MENU_LOCAL_TASK,
+      'file' => 'devel.pages.inc',
+      'file path' => drupal_get_path('module', 'devel'),
+      'weight' => 100,
+    );
+    $items['node/%webform_menu/submission/%webform_menu_submission/devel/load'] = array(
+      'title' => 'Load',
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+    );
+    if (module_exists('token')) {
+      $items['node/%webform_menu/submission/%webform_menu_submission/devel/token'] = array(
+        'title' => 'Tokens',
+        'load arguments' => array(1),
+        'page callback' => 'token_devel_token_object',
+        'page arguments' => array('webform-submission', 3, 'submission'),
+        'access arguments' => array('access devel information'),
+        'type' => MENU_LOCAL_TASK,
+        'file' => 'token.pages.inc',
+        'file path' => drupal_get_path('module', 'token'),
+        'weight' => 5,
+      );
+    }
+  }
 
   return $items;
 }
diff --git a/webform.tokens.inc b/webform.tokens.inc
index ad58c96..8a2e8d6 100644
--- a/webform.tokens.inc
+++ b/webform.tokens.inc
@@ -69,7 +69,7 @@ function webform_tokens($type, $tokens, array $data = array(), array $options =
   if ($type == 'submission' && !empty($data['webform-submission'])) {
     // Prepare all the submission data that we will likely need more than once.
     $submission = $data['webform-submission'];
-    $node = $data['node'] ? $data['node'] : node_load($submission->nid);
+    $node = isset($data['node']) ? $data['node'] : node_load($submission->nid);
     $email = isset($data['webform-email']) ? $data['webform-email'] : NULL;
     $format = isset($email['html']) && $email['html'] ? 'html' : 'text';
     $submission_renderable = webform_submission_render($node, $submission, $email, $format);