diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index b749b6029f..82bbb35e15 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -574,6 +574,8 @@ wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
   : wxInputStream(NULL)
 {
   m_parent_i_stream = &stream;
+  wxDELETE(m_i_streambuf); // In case m_i_streambuf has been initialized.
+  m_i_destroybuf = FALSE;
   m_i_streambuf = stream.InputStreamBuffer();
 }
 
@@ -608,6 +610,8 @@ wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
   : wxOutputStream(NULL)
 {
   m_parent_o_stream = &stream;
+  wxDELETE(m_o_streambuf); // In case m_o_streambuf has been initialized.
+  m_o_destroybuf = FALSE;
   m_o_streambuf = stream.OutputStreamBuffer();
 }
 
diff --git a/src/common/url.cpp b/src/common/url.cpp
index 180511941c..b9a8993e3f 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -147,7 +147,7 @@ bool wxURL::PrepHost(wxString& url)
 
   pos = url.Find('/');
   if (pos == -1)
-    return FALSE;
+    pos = url.Length();
 
   pos2 = url.Find(':');
   if (pos2 != -1 && pos2 < pos) {