diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index 7c58bcbde..156d7fad2 100755
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -257,7 +257,9 @@ final class ReadMapper extends DataMapperAbstract
     {
         $result = $this->executeGet($query);
 
-        if (\is_object($result) && \stripos(\get_class($result), 'Null') < 2) {
+        if (\is_object($result)
+            && (\stripos($class = \get_class($result), 'Null') === 0 || \stripos($class, '\Null') !== false)
+        ) {
             return [];
         }