diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenPartitionedTopology.java b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenPartitionedTopology.java
index 89bad0644..063ce8f9b 100644
--- a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenPartitionedTopology.java
+++ b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/impl/TokenPartitionedTopology.java
@@ -227,7 +227,7 @@ public TokenHostConnectionPoolPartition<CL> getPartition(ByteBuffer rowkey) {
     	List<TokenHostConnectionPoolPartition<CL>> partitions = this.sortedRing.get();
         // Must have a token otherwise we default to the base class
         // implementation
-        if (token == null || partitions == null || partitions.isEmpty()) {
+        if (partitions == null || partitions.isEmpty()) {
             return getAllPools();
         }
 
diff --git a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/writes/AbstractMutationBatchImpl.java b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/writes/AbstractMutationBatchImpl.java
index adae1e656..b09faee2a 100644
--- a/astyanax-cql/src/main/java/com/netflix/astyanax/cql/writes/AbstractMutationBatchImpl.java
+++ b/astyanax-cql/src/main/java/com/netflix/astyanax/cql/writes/AbstractMutationBatchImpl.java
@@ -164,8 +164,10 @@ public String toString() {
 		sb.append("MutationBatch[");
 		boolean first = true;
 		for (Entry<ByteBuffer, Map<String, ColumnListMutation<?>>> row : mutationMap.entrySet()) {
-			if (!first)
+			if (!first) {
 				sb.append(",");
+			}
+			first = false;
 			sb.append(Hex.encodeHex(row.getKey().array()));
 			sb.append(row.getValue().entrySet().toString());
 		}
diff --git a/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftKeyspaceImpl.java b/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftKeyspaceImpl.java
index 8c4be8fa6..1916d7fbf 100755
--- a/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftKeyspaceImpl.java
+++ b/astyanax-thrift/src/main/java/com/netflix/astyanax/thrift/ThriftKeyspaceImpl.java
@@ -635,10 +635,7 @@ public OperationResult<SchemaChangeResult> call() throws Exception {
     
     private OperationResult<SchemaChangeResult> createKeyspaceIfNotExists(Callable<OperationResult<SchemaChangeResult>> createKeyspace) throws ConnectionException {
         
-    	boolean shouldCreateKeyspace = false;
-    	
-    	try { 
-    		
+    	try {
     		OperationResult<KeyspaceDefinition> opResult = this.internalDescribeKeyspace();
         	
     		if (opResult != null && opResult.getResult() != null) {
@@ -646,28 +643,20 @@ private OperationResult<SchemaChangeResult> createKeyspaceIfNotExists(Callable<O
                         new SchemaChangeResponseImpl().setSchemaId("no-op"), 
                         opResult.getLatency());
 
-        	} else {
-        		shouldCreateKeyspace = true;
         	}
         } catch (BadRequestException e) {
-        	if (e.isKeyspaceDoestNotExist()) {
-        		shouldCreateKeyspace = true;
-        	} else {
-        		throw e;
+        	if (!e.isKeyspaceDoestNotExist()) {
+                throw e;
         	}
         }
     	
-    	if (shouldCreateKeyspace) {
-    		try {
-				return createKeyspace.call();
-			} catch (ConnectionException e) {
-				throw e;
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-    	} else {
-    		throw new IllegalStateException();
-    	}
+        try {
+            return createKeyspace.call();
+        } catch (ConnectionException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }