Exception removed from Issue #274
Merge branch 'develop' of https://github.com/cassandra-project/platform into develop