diff --git a/src/com/google/bitcoin/core/GetBlocksMessage.java b/src/com/google/bitcoin/core/GetBlocksMessage.java
index ba5636b8..3c957f05 100644
--- a/src/com/google/bitcoin/core/GetBlocksMessage.java
+++ b/src/com/google/bitcoin/core/GetBlocksMessage.java
@@ -86,7 +86,7 @@ public class GetBlocksMessage extends Message {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof GetBlocksMessage)) return false;
+        if (o == null || o.getClass() != getClass()) return false;
         GetBlocksMessage other = (GetBlocksMessage) o;
         return (other.version == version &&
                 locator.size() == other.locator.size() && locator.containsAll(other.locator) &&
diff --git a/src/com/google/bitcoin/core/GetHeadersMessage.java b/src/com/google/bitcoin/core/GetHeadersMessage.java
index 8f1c8081..b52786cd 100644
--- a/src/com/google/bitcoin/core/GetHeadersMessage.java
+++ b/src/com/google/bitcoin/core/GetHeadersMessage.java
@@ -46,7 +46,7 @@ public class GetHeadersMessage extends GetBlocksMessage {
      */
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof GetHeadersMessage)) return false;
+        if (o == null || o.getClass() != getClass()) return false;
         GetHeadersMessage other = (GetHeadersMessage) o;
         return (other.version == version &&
                 locator.size() == other.locator.size() && locator.containsAll(other.locator) &&