diff --git a/modules/library/dnd/plugins/dndck4/plugin.js b/modules/library/dnd/plugins/dndck4/plugin.js
index 856cb21..b0e7b0e 100644
--- a/modules/library/dnd/plugins/dndck4/plugin.js
+++ b/modules/library/dnd/plugins/dndck4/plugin.js
@@ -678,7 +678,7 @@ Drupal.dndck4 = {
       && el.children[0] && el.children[0].type == CKEDITOR.NODE_ELEMENT && el.children[0].hasClass('dnd-drop-wrapper')) {
       var sas = el.children[0].getHtml();
       var data = Drupal.dnd.sas2array(sas);
-      if (data) {
+      if (data && data.sid) {
         // Grab the atom type and alignment.
         data.align = 'none';
         $.each(el.attributes['class'].split(/\s+/), function (index, item) {
@@ -702,6 +702,13 @@ Drupal.dndck4 = {
         el.replaceWith(newEl);
         el = newEl;
       }
+      else{
+	      alert('You have a malformed Atom from a previous version of Scald. We are converting it back to markup so it does not break. Please review and replace if necessary');
+	      //Remove the Atom Wrapper so we don't process it again
+	      el.removeClass('dnd-atom-wrapper');
+	      //Remove the Drop wrapper so it doesn't process
+	      el.children[0].removeClass('dnd-drop-wrapper');
+      }
     }
     return el;
   }