diff --git a/rdb/Connection.php b/rdb/Connection.php
index dcfdf63..5d7519c 100644
--- a/rdb/Connection.php
+++ b/rdb/Connection.php
@@ -271,7 +271,6 @@ public function run(Query $query, $options = array(), &$profile = '')
         } else {
             return $this->createCursorFromResponse($response, $token, $response['n'], $toNativeOptions);
         }
-
     }
 
     public function continueQuery($token)
diff --git a/rdb/DatumConverter.php b/rdb/DatumConverter.php
index 055e3a9..bde0cf0 100644
--- a/rdb/DatumConverter.php
+++ b/rdb/DatumConverter.php
@@ -34,7 +34,7 @@ public function nativeToDatum($v)
                 if (!is_numeric($key) && !is_string($key)) {
                     throw new RqlDriverError("Key must be a string.");
                 }
-                if (is_subclass_of($val, "\\r\\Query") && !is_subclass_of($val, '\r\Datum\Datum')) {
+                if (!is_string($val) && is_subclass_of($val, "\\r\\Query") && !is_subclass_of($val, '\r\Datum\Datum')) {
                     $subDatum = $val;
                     $mustUseMakeTerm = true;
                 } else {
@@ -158,7 +158,6 @@ public function canEncodeAsJson($v)
         }
 
         return false;
-
     }
 
     public function wrapImplicitVar(Query $q)