diff --git a/lib/em-http/http_connection_options.rb b/lib/em-http/http_connection_options.rb
index 0cfd775..2cab523 100644
--- a/lib/em-http/http_connection_options.rb
+++ b/lib/em-http/http_connection_options.rb
@@ -18,6 +18,7 @@ def initialize(uri, options)
     end
 
     uri = uri.kind_of?(Addressable::URI) ? uri : Addressable::URI::parse(uri.to_s)
+    raise Addressable::URI::InvalidURIError if uri.to_s =~ /\s/
     @https = uri.scheme == "https"
     uri.port ||= (@https ? 443 : 80)
     @tls[:sni_hostname] = uri.hostname
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index c8bfe45..cf7d757 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -50,10 +50,40 @@ def failed(http=nil)
   it "should raise error on invalid URL" do
     EventMachine.run {
       lambda {
-      EventMachine::HttpRequest.new('random?text').get
-    }.should raise_error(Addressable::URI::InvalidURIError)
+        EventMachine::HttpRequest.new('random?text').get
+      }.should raise_error(Addressable::URI::InvalidURIError)
 
-    EM.stop
+      EM.stop
+    }
+  end
+
+  it "should raise error on invalid URL containing spaces in path" do
+    EventMachine.run {
+      lambda {
+        EventMachine::HttpRequest.new('http://127.0.0.1:8090/path with space').get
+      }.should raise_error(Addressable::URI::InvalidURIError)
+
+      EM.stop
+    }
+  end
+
+  it "should raise error on invalid URL containing newlines in path" do
+    EventMachine.run {
+      lambda {
+        EventMachine::HttpRequest.new("http://127.0.0.1:8090/path\nwith\nnewlines").get
+      }.should raise_error(Addressable::URI::InvalidURIError)
+
+      EM.stop
+    }
+  end
+
+  it "should raise error on invalid URL containing spaces in query" do
+    EventMachine.run {
+      lambda {
+        EventMachine::HttpRequest.new('http://127.0.0.1:8090/?query=with space').get
+      }.should raise_error(Addressable::URI::InvalidURIError)
+
+      EM.stop
     }
   end