Index: com/caucho/hessian/io/UnsafeDeserializer.java =================================================================== --- com/caucho/hessian/io/UnsafeDeserializer.java (revision 6917) +++ com/caucho/hessian/io/UnsafeDeserializer.java (working copy) @@ -690,8 +690,9 @@ try { java.util.Date date = (java.util.Date) in.readObject(); - value = new java.sql.Date(date.getTime()); - + if (date != null) { + value = new java.sql.Date(date.getTime()); + } _unsafe.putObject(obj, _offset, value); } catch (Exception e) { logDeserializeError(_field, obj, value, e); @@ -718,7 +719,9 @@ try { java.util.Date date = (java.util.Date) in.readObject(); - value = new java.sql.Timestamp(date.getTime()); + if (date != null) { + value = new java.sql.Timestamp(date.getTime()); + } _unsafe.putObject(obj, _offset, value); } catch (Exception e) { @@ -746,8 +749,9 @@ try { java.util.Date date = (java.util.Date) in.readObject(); - value = new java.sql.Time(date.getTime()); - + if (date != null) { + value = new java.sql.Time(date.getTime()); + } _unsafe.putObject(obj, _offset, value); } catch (Exception e) { logDeserializeError(_field, obj, value, e);