diff --git a/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java b/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
index 7d9021c04abf983bc23dfbda29cc4de7d860bed6..9288d5ace05ca1a3b63c0c4fa5067741e33c7bee 100644
--- a/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
+++ b/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java
@@ -26,6 +26,12 @@ public class SkyDemoActivity extends SkyActivity {
         if (Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri skyUri = intent.getData();
             Uri httpsUri = skyUri.buildUpon().scheme("https").build();
+            // This is a hack to disable https for local testing.
+            // getHost may be null if we're passed a non-normalized url.
+            if (skyUri.getHost() != null
+                    && skyUri.getHost().equals("localhost")) {
+                httpsUri = skyUri.buildUpon().scheme("http").build();
+            }
             url = httpsUri.toString();
         }
 
diff --git a/engine/web/WebLocalFrameImpl.cpp b/engine/web/WebLocalFrameImpl.cpp
index 035661356d2fe279eaf85118dc1f10cd66ec51b9..e3a3c6f1b5ef98eafe637ae3317fe02301bb1ad4 100644
--- a/engine/web/WebLocalFrameImpl.cpp
+++ b/engine/web/WebLocalFrameImpl.cpp
@@ -73,6 +73,8 @@
 #include "sky/engine/web/WebLocalFrameImpl.h"
 
 #include <algorithm>
+#include "base/strings/stringprintf.h"
+#include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "sky/engine/bindings/exception_state.h"
 #include "sky/engine/bindings/exception_state_placeholder.h"
@@ -82,12 +84,12 @@
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/editing/Editor.h"
 #include "sky/engine/core/editing/FrameSelection.h"
+#include "sky/engine/core/editing/htmlediting.h"
 #include "sky/engine/core/editing/InputMethodController.h"
 #include "sky/engine/core/editing/PlainTextRange.h"
 #include "sky/engine/core/editing/SpellChecker.h"
 #include "sky/engine/core/editing/TextAffinity.h"
 #include "sky/engine/core/editing/TextIterator.h"
-#include "sky/engine/core/editing/htmlediting.h"
 #include "sky/engine/core/frame/FrameHost.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalDOMWindow.h"
@@ -105,13 +107,13 @@
 #include "sky/engine/core/rendering/RenderTreeAsText.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/core/rendering/style/StyleInheritedData.h"
-#include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/clipboard/ClipboardUtilities.h"
 #include "sky/engine/platform/fonts/FontCache.h"
 #include "sky/engine/platform/graphics/GraphicsContext.h"
 #include "sky/engine/platform/graphics/skia/SkiaUtils.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/platform/network/ResourceRequest.h"
+#include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/weborigin/KURL.h"
 #include "sky/engine/platform/weborigin/SecurityPolicy.h"
 #include "sky/engine/public/platform/Platform.h"
@@ -272,9 +274,26 @@ void WebLocalFrameImpl::load(const WebURL& url)
 void WebLocalFrameImpl::OnReceivedResponse(mojo::URLResponsePtr response)
 {
     m_fetcher.clear();
-    if (!response->body.is_valid())
-        LOG(FATAL) << "Response has no body.";
-    frame()->mojoLoader().parse(response->body.Pass());
+    if (response->body.is_valid()) {
+        frame()->mojoLoader().parse(response->body.Pass());
+        return;
+    }
+    LOG(ERROR) << "Response for " << response->url
+        << " (status " << response->status_code  << ") has no body.";
+
+    // TODO(eseidel): This is a hack, but makes debugging way easier.
+    mojo::DataPipe pipe;
+    frame()->mojoLoader().parse(pipe.consumer_handle.Pass());
+    std::string error_response = base::StringPrintf(
+        "<error><h>Empty Body</h><l>%d %s</l><m>%s</m></t></error>",
+        response->status_code, response->status_line.get().c_str(),
+        response->error->description.get().c_str());
+
+    uint32_t length = error_response.length();
+    MojoWriteData(pipe.producer_handle.get().value(),
+                  error_response.data(),
+                  &length,
+                  MOJO_WRITE_DATA_FLAG_ALL_OR_NONE);
 }
 
 void WebLocalFrameImpl::replaceSelection(const WebString& text)
diff --git a/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java b/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
index dffe88060c9e413663e22eaa4d25f21d0887d89c..defbb49b1c9cab488b4b2b89534bbedeeb9a42ad 100644
--- a/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
+++ b/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
@@ -133,6 +133,7 @@ public class UrlLoaderImpl implements UrlLoader {
                 // TODO(abarth): Which mError.code should we set?
                 mError.description = e.toString();
                 UrlResponse urlResponse = new UrlResponse();
+                urlResponse.url = request.urlString();
                 urlResponse.error = mError;
                 responseCallback.call(urlResponse);