diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 26445d4a25..c7095167a0 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1440,7 +1440,9 @@ class BaseBuilder
 			$this->QBOrderBy = $orderby;
 		}
 
-		$row = $result->getRow();
+		$row = is_bool($result)
+			? null
+			: $result->getRow();
 
 		if (empty($row))
 		{
diff --git a/tests/system/Database/Live/ModelTest.php b/tests/system/Database/Live/ModelTest.php
index cb5514e7be..728d971d3a 100644
--- a/tests/system/Database/Live/ModelTest.php
+++ b/tests/system/Database/Live/ModelTest.php
@@ -496,7 +496,7 @@ class ModelTest extends \CIDatabaseTestCase
         $date = $this->getPrivateProperty($entity, 'created_at');
         $this->assertTrue($date instanceof Time);
 
-        $model->save($entity);
+        $this->assertTrue($model->save($entity));
 
         $this->seeInDatabase('job', ['name' => 'Senior Developer', 'created_at' => '2017-07-15 00:00:00']);
     }