Make sure not to fail in getSubtable()

1 files changed, 5 insertions, 1 deletions

diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index c6c0d21e9f..0e7d329d77 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -317,7 +317,11 @@ class Row implements \ArrayAccess, \IteratorAggregate
     public function getSubtable()
     {
         if ($this->isSubtableLoaded()) {
-            return Manager::getInstance()->getTable($this->getIdSubDataTable());
+            try {
+                return Manager::getInstance()->getTable($this->getIdSubDataTable());
+            } catch(TableNotFoundException $e) {
+                // edge case
+            }
         }
         return false;
     }