diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php
index 06ca38bf..09c8d5d6 100644
--- a/library/Director/Web/Form/DirectorObjectForm.php
+++ b/library/Director/Web/Form/DirectorObjectForm.php
@@ -1235,6 +1235,11 @@ abstract class DirectorObjectForm extends QuickForm
         if (array_key_exists($id, $tpl)) {
             unset($tpl[$id]);
         }
+
+        if (empty($tpl)) {
+            return array();
+        }
+
         $tpl = array_combine($tpl, $tpl);
         return $tpl;
     }