diff --git a/webform_entity.module b/webform_entity.module
index 31f7dfe..4f50e4d 100644
--- a/webform_entity.module
+++ b/webform_entity.module
@@ -493,7 +493,7 @@ function webform_entity_webform_submission_submit(&$form, &$form_state) {
   if (in_array($form['#node']->type, array_keys(webform_entity_get_types()))) {
     $submission =& $form['#submission'];
-    if (!is_object($submission) && is_array($submission)) {
+    if ((!is_object($submission) && is_array($submission)) || empty($submission)) {
       $submission = new stdclass;
       $submission->bundle = $form['#node']->type;
     }