diff --git a/app/javascript/views/answers/edit.js b/app/javascript/views/answers/edit.js
index 409363a..fb78b5d 100644
--- a/app/javascript/views/answers/edit.js
+++ b/app/javascript/views/answers/edit.js
@@ -55,8 +55,10 @@
             // Refresh optimistic locking view with the form that caused the locking
             $(`#answer-locking-${data.question.id}-research-output-${data.research_output.id}`).html(data.question.locking);
           } else { // When answer is NOT stale...
+            const newForm = $(`#answer-form-${data.question.id}-research-output-${data.research_output.id}`).find('form');
             $(`#answer-locking-${data.question.id}-research-output-${data.research_output.id}`).html('');
-            $(`#answer-form-${data.question.id}-research-output-${data.research_output.id}`).html(data.question.form);
+            newForm.html(data.question.form);
+
             if (isNumber(data.question.answer_lock_version)) {
               form.find('#answer_lock_version').val(data.question.answer_lock_version);
             }
diff --git a/app/models/madmp_fragment.rb b/app/models/madmp_fragment.rb
index 5549275..8d0d477 100644
--- a/app/models/madmp_fragment.rb
+++ b/app/models/madmp_fragment.rb
@@ -242,7 +242,7 @@
       if schema_prop['type'].eql?('object')
         sub_data = content # TMP: for readability
         sub_schema = MadmpSchema.find(schema_prop['schema_id'])
-        sub_fragment = MadmpFragment.find(self.data[prop]['dbid']) unless self.data.nil?
+        sub_fragment = MadmpFragment.find(self.data[prop]['dbid']) unless self.data.nil? || self.data.empty?
 
         if sub_fragment.nil?
           sub_fragment = MadmpFragment.new(