diff --git a/Changelog.md b/Changelog.md
index b3a89a04..ecfc257e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,16 @@
+# v0.2.4 2012-12-08
+
+* [fixed] Crash on mutating yield, added a noop for now
+* [fixed] Crash on singleton methods defined on other than constants or self
+
+[Compare v0.2.3..v0.2.4](https://github.com/mbj/mutant/compare/v0.2.1...v0.2.2)
+
 # v0.2.3 2012-12-08
 
 * [fixed] Prepend extra elements to hash and array instead of append. This fixes unkillable mutators in parallel assignments!
 
+[Compare v0.2.2..v0.2.3](https://github.com/mbj/mutant/compare/v0.2.1...v0.2.2)
+
 # v0.2.2 2012-12-07
 
 * [feature] Add a shitload of operator expansions for dm2 strategy
diff --git a/lib/mutant/matcher/method/singleton.rb b/lib/mutant/matcher/method/singleton.rb
index c46ef0a2..1211f66f 100644
--- a/lib/mutant/matcher/method/singleton.rb
+++ b/lib/mutant/matcher/method/singleton.rb
@@ -104,7 +104,8 @@ module Mutant
           when Rubinius::AST::ConstantAccess
             receiver_name?(receiver)
           else
-            raise 'Can only match receiver on Rubinius::AST::Self or Rubinius::AST::ConstantAccess'
+            $stderr.puts "Unable to find singleton method definition only match receiver on Rubinius::AST::Self or Rubinius::AST::ConstantAccess, got #{receiver.class}"
+            false
           end
         end
 
diff --git a/lib/mutant/mutator/node/noop.rb b/lib/mutant/mutator/node/noop.rb
index 8fe19a8c..f3ed12b6 100644
--- a/lib/mutant/mutator/node/noop.rb
+++ b/lib/mutant/mutator/node/noop.rb
@@ -37,6 +37,7 @@ module Mutant
         handle(Rubinius::AST::OpAssign1)
         handle(Rubinius::AST::Or)
         handle(Rubinius::AST::ConstantAccess)
+        handle(Rubinius::AST::Yield)
       
       private