diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 4e2f7468e..76a6f5b8d 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -133,8 +133,14 @@ class PersonMove
 
         $conditions = [];
 
-        foreach ($mapping['joinColumns'] as $columns) {
-            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+        if (array_key_exists('joinTable', $mapping)) {
+            foreach ($mapping['joinTable']['joinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['referencedColumnName'], $from->getId());
+            }
+        } elseif (array_key_exists('joinColumns', $mapping)) {
+            foreach ($mapping['joinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
         }
 
         return sprintf(
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
index 1e770062a..b8edcc437 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -4,7 +4,7 @@
     <li><b>{{ 'gender'|trans }}</b>:
         {{ person.gender|trans }}</li>
     <li><b>{{ 'maritalStatus'|trans }}</b>:
-        {% if person.maritalStatus.name %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
+        {% if person.maritalStatus %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
     <li><b>{{ 'birthdate'|trans }}</b>:
         {% if person.birthdate is not null %}{{ person.birthdate|format_date('short') }}{% endif %}</li>
     <li><b>{{ 'placeOfBirth'|trans }}</b>: