diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index 13318fe92..7c58bcbde 100755
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -255,9 +255,9 @@ final class ReadMapper extends DataMapperAbstract
      */
     public function executeGetAll(Builder $query = null) : array
     {
-         $result = $this->executeGet($query);
+        $result = $this->executeGet($query);
 
-        if (\is_object($result) && \stripos(\get_class($result), '\Null') !== false) {
+        if (\is_object($result) && \stripos(\get_class($result), 'Null') < 2) {
             return [];
         }