diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index 87daff495..298253864 100755
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -216,7 +216,7 @@ final class ReadMapper extends DataMapperAbstract
                 /** @var null|Builder ...$options */
                 return $this->executeGetAll(...$options);
             case MapperType::GET_RANDOM:
-                return $this->executeGetRaw();
+                return $this->executeRandom();
             case MapperType::COUNT_MODELS:
                 return $this->executeCount();
             case MapperType::SUM_MODELS:
diff --git a/Stdlib/Tree/BinarySearchTree.php b/Stdlib/Tree/BinarySearchTree.php
index d29c16398..2686b3075 100644
--- a/Stdlib/Tree/BinarySearchTree.php
+++ b/Stdlib/Tree/BinarySearchTree.php
@@ -253,15 +253,15 @@ class BinarySearchTree
                 if ($node->parent->left !== null
                     && $node->parent->left->root?->compare($node->data) === 0
                 ) {
-                    $node->parent->left = $temp?->tree;
+                    $node->parent->left = $temp->tree;
                 } elseif ($node->parent->right !== null
                     && $node->parent->right->root?->compare($node->data) === 0
                 ) {
-                    $node->parent->right = $temp?->tree;
+                    $node->parent->right = $temp->tree;
                 }
             }
 
-            $temp->parent = $node?->parent;
+            $temp->parent = $node->parent;
 
             $node = null;
 
@@ -278,15 +278,15 @@ class BinarySearchTree
                 if ($node->parent->left !== null
                     && $node->parent->left->root?->compare($node->data) === 0
                 ) {
-                    $node->parent->left = $temp?->tree;
+                    $node->parent->left = $temp->tree;
                 } elseif ($node->parent->right !== null
                     && $node->parent->right->root?->compare($node->data) === 0
                 ) {
-                    $node->parent->right = $temp?->tree;
+                    $node->parent->right = $temp->tree;
                 }
             }
 
-            $temp->parent = $node?->parent;
+            $temp->parent = $node->parent;
 
             $node = null;