Updates

systemson · Apr 8, 2019 · 6726ef1 · 6726ef1
1 parent 50e9101
commit 6726ef1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Base/BaseCollection.php b/src/Base/BaseCollection.php
@@ -175,7 +175,9 @@ public function find(string $key)
      */
     public function first()
     {
-        return $this->find($this->keys()[0]);
+    	if ($this->isNotEmpty()) {
+        	return $this->find($this->keys()[0]);
+        }
     }
 
     /**
@@ -185,7 +187,9 @@ public function first()
      */
     public function last()
     {
-        return $this->find($this->keys()[$this->count() - 1]);
+    	if ($this->isNotEmpty()) {
+        	return $this->find($this->keys()[$this->count() - 1]);
+    	}
     }
 
     /**