diff --git a/Gemfile b/Gemfile
index 481e938ab6f846b195eac2cc5b6a137ea6e86358..1434dcd91915aa18af9fb265380c573ce9fe7ea1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "amazing_print"
 gem "bandwidth-sdk", "<= 6.1.0"
-gem "blather", git: "https://github.com/adhearsion/blather", branch: "develop"
+gem "blather", git: "https://github.com/psycotica0/blather", branch: "cv_new_id"
 gem "braintree"
 gem "dhall", ">= 0.5.3.fixed"
 gem "em-hiredis"
diff --git a/lib/blather_client.rb b/lib/blather_client.rb
index 6de5c2ddf899d9b9999f5ade86db6c335011eecc..29aec145b9e0a82b4644f6f6167a4d2e18efa1a8 100644
--- a/lib/blather_client.rb
+++ b/lib/blather_client.rb
@@ -59,7 +59,8 @@ class BlatherClient < Blather::Client
 			found = stanza.find(*guards)
 			handler.call(stanza, found) unless found.empty?
 		else
-			handler.call(stanza) unless guarded?(guards, stanza)
+			throw :pass if guarded?(guards, stanza)
+			handler.call(stanza)
 		end
 
 		return result unless result.is_a?(Promise)