diff --git a/lib/Pheasant/Database/Mysqli/Binder.php b/lib/Pheasant/Database/Mysqli/Binder.php
index <HASH>..<HASH> 100755
--- a/lib/Pheasant/Database/Mysqli/Binder.php
+++ b/lib/Pheasant/Database/Mysqli/Binder.php
@@ -16,6 +16,6 @@ class Binder extends \Pheasant\Database\Binder
 
 	public function escape($string)
 	{
-		return is_null($string) ? $string : $this->_link->escape_string($string);
+		return is_string($string) ? $this->_link->escape_string($string) : $string;
 	}
 }
diff --git a/lib/Pheasant/Database/Mysqli/Table.php b/lib/Pheasant/Database/Mysqli/Table.php
index <HASH>..<HASH> 100755
--- a/lib/Pheasant/Database/Mysqli/Table.php
+++ b/lib/Pheasant/Database/Mysqli/Table.php
@@ -132,7 +132,8 @@ class Table
 	}
 
 	/**
-	 * Tries to update a record, or inserts if it doesn't exist
+	 * Tries to update a record, or inserts if it doesn't exist. Worth noting 
+	 * that affectedRows will be 2 on an update, 1 on an insert.
 	 */
 	public function upsert($data)
 	{
Updated Mysql binder to support bools