diff --git a/sgx_jmp.rb b/sgx_jmp.rb
index a402a2fcfdaef09d5d711e6376e5b1edcae5dc5a..ecd50ec2b486a945a8cb90d6d5c67157f48fd264 100644
--- a/sgx_jmp.rb
+++ b/sgx_jmp.rb
@@ -3,8 +3,7 @@
 require "pg/em/connection_pool"
 require "bandwidth"
 require "bigdecimal"
-require "blather/client/dsl" # Require this first to not auto-include
-require "blather/client"
+require "blather/client/dsl"
 require "braintree"
 require "date"
 require "dhall"
@@ -897,3 +896,7 @@ iq type: [:get, :set] do |iq|
 
 	self << Blather::StanzaError.new(iq, "feature-not-implemented", :cancel)
 end
+
+trap(:INT) { EM.stop }
+trap(:TERM) { EM.stop }
+EM.run { client.run }