diff --git a/src/System/Mapper.php b/src/System/Mapper.php
index <HASH>..<HASH> 100755
--- a/src/System/Mapper.php
+++ b/src/System/Mapper.php
@@ -315,7 +315,7 @@ class Mapper {
 	 * Create a new instance of the mapped entity class

 	 * 

 	 * @param  array  $attributes 

-	 * @return Analogue\ORM\Entity

+	 * @return mixed

 	 */

 	public function newInstance($attributes = array() )

 	{

@@ -323,7 +323,11 @@ class Mapper {
 

 		$entity = $this->customClassInstance($class);

 

-		$entity->setEntityAttributes($attributes);

+		// Prevent Hydrating with an empty array 

+		if (count($attributes) > 0)

+		{

+			$entity->setEntityAttributes($attributes);

+		}

 

 		return $entity;

 	}

@@ -333,7 +337,7 @@ class Mapper {
 	 * can instantiate without calling the constructor,

 	 * allowing users to have proper entity's constructors.

 	 * 

-	 * @return Analogue\ORM\Entity

+	 * @return mixed

 	 */

 	protected function customClassInstance($className)

 	{

diff --git a/src/System/Query.php b/src/System/Query.php
index <HASH>..<HASH> 100755
--- a/src/System/Query.php
+++ b/src/System/Query.php
@@ -790,7 +790,7 @@ class Query {
 	public function getEntities($columns = array('*'))
 	{
 		$results = $this->query->get($columns);
-
+		
 		$entities = array();
 
 		$prototype = $this->getEntityInstance();
Prevent hydrating with an empty array