Fix #3: "timestamp" can be null