diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index dbb213c..f670e82 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -153,6 +153,10 @@ def ~
 
   # Returns true if two ipaddrs are equal.
   def ==(other)
+    if other.nil?
+      return false
+    end
+
     other = coerce_other(other)
   rescue
     false
diff --git a/test/test_ipaddr.rb b/test/test_ipaddr.rb
index 3e5c3d2..645a552 100644
--- a/test/test_ipaddr.rb
+++ b/test/test_ipaddr.rb
@@ -394,6 +394,8 @@ def test_equal
     assert_equal(false, @a != IPAddr.new("3ffe:505:2::"))
     assert_equal(false, @a == @inconvertible_range)
     assert_equal(false, @a == @inconvertible_string)
+    assert_equal(false, IPAddr.new("0.0.0.0") == nil)
+    assert_equal(false, IPAddr.new("::") == nil)
   end
 
   def test_compare