Fix NPE caused by CASSANDRA-6818

patch by yukim; reviewed by thobbs for CASSANDRA-6984
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk