move null guard to where it's useful
Merge branch 'cassandra-2.1' into trunk