2 files changed, 6 insertions, 2 deletions
diff --git a/TODO.rst b/TODO.rst
index 3455e2a..fac6d4a 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -1,2 +1,6 @@
-- Implement a basic long-standing leader PaceMaker
+- Implement a basic long-standing leader PaceMaker (WIP)
+
+  - Add nounce field to blocks ?
+  - Or add proposer's ID + signature to blocks ?
+
 - Persistent protocol state (for safety)
diff --git a/include/hotstuff/consensus.h b/include/hotstuff/consensus.h
index b176eb4..1528b40 100644
--- a/include/hotstuff/consensus.h
+++ b/include/hotstuff/consensus.h
@@ -212,7 +212,7 @@ struct Vote: public Serializable {
         voter(other.voter),
         bqc_hash(other.bqc_hash),
         blk_hash(other.blk_hash),
-        cert(other.cert->clone()),
+        cert(other.cert ? other.cert->clone() : nullptr),
         hsc(other.hsc) {}
 
     Vote(Vote &&other) = default;