diff --git a/mozilla/extensions/datetime/nsDateTimeChannel.cpp b/mozilla/extensions/datetime/nsDateTimeChannel.cpp
index 7214f4f8310..01df6eda510 100644
--- a/mozilla/extensions/datetime/nsDateTimeChannel.cpp
+++ b/mozilla/extensions/datetime/nsDateTimeChannel.cpp
@@ -55,9 +55,20 @@ nsDateTimeChannel::Init(const char* verb,
 {
     nsresult rv;
 
+    NS_ASSERTION(uri, "no uri");
+
     mOriginalURI = originalURI ? originalURI : uri;
     mUrl = uri;
 
+    rv = mUrl->GetPort(&mPort);
+    if (NS_FAILED(rv) || mPort < 1)
+        mPort = DATETIME_PORT;
+
+    rv = mUrl->GetPath(getter_Copies(mHost));
+    if (NS_FAILED(rv)) return rv;
+
+    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
+
     rv = SetLoadAttributes(loadAttributes);
     if (NS_FAILED(rv)) return rv;
     rv = SetLoadGroup(aLoadGroup);
@@ -65,12 +76,6 @@ nsDateTimeChannel::Init(const char* verb,
     rv = SetNotificationCallbacks(notificationCallbacks);
     if (NS_FAILED(rv)) return rv;
 
-    rv = mUrl->GetPort(&mPort);
-    if (NS_FAILED(rv) || mPort < 1)
-        mPort = DATETIME_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(mHost));
-    if (NS_FAILED(rv)) return rv;
     return NS_OK;
 }
 
diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp
index 7214f4f8310..01df6eda510 100644
--- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp
+++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeChannel.cpp
@@ -55,9 +55,20 @@ nsDateTimeChannel::Init(const char* verb,
 {
     nsresult rv;
 
+    NS_ASSERTION(uri, "no uri");
+
     mOriginalURI = originalURI ? originalURI : uri;
     mUrl = uri;
 
+    rv = mUrl->GetPort(&mPort);
+    if (NS_FAILED(rv) || mPort < 1)
+        mPort = DATETIME_PORT;
+
+    rv = mUrl->GetPath(getter_Copies(mHost));
+    if (NS_FAILED(rv)) return rv;
+
+    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
+
     rv = SetLoadAttributes(loadAttributes);
     if (NS_FAILED(rv)) return rv;
     rv = SetLoadGroup(aLoadGroup);
@@ -65,12 +76,6 @@ nsDateTimeChannel::Init(const char* verb,
     rv = SetNotificationCallbacks(notificationCallbacks);
     if (NS_FAILED(rv)) return rv;
 
-    rv = mUrl->GetPort(&mPort);
-    if (NS_FAILED(rv) || mPort < 1)
-        mPort = DATETIME_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(mHost));
-    if (NS_FAILED(rv)) return rv;
     return NS_OK;
 }