diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index a2cf1e7e3f..63279d17e7 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -370,29 +370,29 @@ public class CqlConfigHelper
         conf.set(INPUT_NATIVE_AUTH_PROVIDER, authProvider);
     }
 
-    public static void setInputNativeSSLTruststorePath(Configuration conf, String authProvider)
+    public static void setInputNativeSSLTruststorePath(Configuration conf, String path)
     {
-        conf.set(INPUT_NATIVE_SSL_TRUST_STORE_PATH, authProvider);
+        conf.set(INPUT_NATIVE_SSL_TRUST_STORE_PATH, path);
     } 
 
-    public static void setInputNativeSSLKeystorePath(Configuration conf, String authProvider)
+    public static void setInputNativeSSLKeystorePath(Configuration conf, String path)
     {
-        conf.set(INPUT_NATIVE_SSL_KEY_STORE_PATH, authProvider);
+        conf.set(INPUT_NATIVE_SSL_KEY_STORE_PATH, path);
     }
 
-    public static void setInputNativeSSLKeystorePassword(Configuration conf, String authProvider)
+    public static void setInputNativeSSLKeystorePassword(Configuration conf, String pass)
     {
-        conf.set(INPUT_NATIVE_SSL_KEY_STORE_PASSWARD, authProvider);
+        conf.set(INPUT_NATIVE_SSL_KEY_STORE_PASSWARD, pass);
     }
 
-    public static void setInputNativeSSLTruststorePassword(Configuration conf, String authProvider)
+    public static void setInputNativeSSLTruststorePassword(Configuration conf, String pass)
     {
-        conf.set(INPUT_NATIVE_SSL_TRUST_STORE_PASSWARD, authProvider);
+        conf.set(INPUT_NATIVE_SSL_TRUST_STORE_PASSWARD, pass);
     }
 
-    public static void setInputNativeSSLCipherSuites(Configuration conf, String authProvider)
+    public static void setInputNativeSSLCipherSuites(Configuration conf, String suites)
     {
-        conf.set(INPUT_NATIVE_SSL_CIPHER_SUITES, authProvider);
+        conf.set(INPUT_NATIVE_SSL_CIPHER_SUITES, suites);
     }
 
     public static void setInputNativeReuseAddress(Configuration conf, String reuseAddress)
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 63356e69d2..d81eae9e8a 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -29,7 +29,6 @@ import com.google.common.collect.Maps;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.BytesType;
 import org.apache.cassandra.dht.IPartitioner;
@@ -125,7 +124,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         }
 
         if (cluster != null)
-            session = cluster.connect(keyspace);
+            session = cluster.connect(quote(keyspace));
         rowIterator = new RowIterator();
         logger.debug("created {}", rowIterator);
     }
@@ -488,4 +487,9 @@ public class CqlRecordReader extends RecordReader<Long, Row>
             return row.getMap(name, keysClass, valuesClass);
         }
     }
+
+    private String quote(String identifier)
+    {
+        return "\"" + identifier.replaceAll("\"", "\"\"") + "\"";
+    }
 }