Fix IllegalArgumentException in CqlStorage

patch by slebresne; reviewed by driftx for CASSANDRA-7287