From a0485b5e348a54c09ec876a01ffab3cff0d4db7f Mon Sep 17 00:00:00 2001
From: Ilya Grigorik <ilya@igvita.com>
Date: Fri, 18 Mar 2011 17:00:25 -0600
Subject: [PATCH] check that uri is not nil

---
 lib/em-http/http_encoding.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/em-http/http_encoding.rb b/lib/em-http/http_encoding.rb
index cef94594..e241e58d 100644
--- a/lib/em-http/http_encoding.rb
+++ b/lib/em-http/http_encoding.rb
@@ -63,7 +63,7 @@ def encode_query(uri, query)
         query.to_s
       end
 
-      if !uri.query.to_s.empty?
+      if uri && !uri.query.to_s.empty?
         encoded_query = [encoded_query, uri.query].reject {|part| part.empty?}.join("&")
       end
       encoded_query.to_s.empty? ? uri.path : "#{uri.path}?#{encoded_query}"