diff --git a/src/Types/CassandraObjectConverter.cs b/src/Types/CassandraObjectConverter.cs index 4ec173c..9c80736 100644 --- a/src/Types/CassandraObjectConverter.cs +++ b/src/Types/CassandraObjectConverter.cs @@ -52,6 +52,10 @@ public virtual byte[] ToBigEndian(T value) public virtual T FromBigEndian(byte[] value) { + if (value == null) + { + return default(T); + } var bytes = ConvertEndian(value); var obj = ConvertFromInternal(bytes); return obj;