diff --git a/src-tauri/src/http.rs b/src-tauri/src/http.rs
index 619bc1c2..540b9470 100644
--- a/src-tauri/src/http.rs
+++ b/src-tauri/src/http.rs
@@ -80,10 +80,16 @@ pub async fn send_http_request(
         ));
     }
 
-    // .use_rustls_tls() // TODO: Make this configurable (maybe)
     let client = client_builder.build().expect("Failed to build client");
 
-    let url = match Url::from_str(url_string.as_str()) {
+    let uri = match http::Uri::from_str(url_string.as_str()) {
+        Ok(u) => u,
+        Err(e) => {
+            return response_err(response, e.to_string(), window).await;
+        }
+    };
+    // Yes, we're parsing both URI and URL because they could return different errors
+    let url = match Url::from_str(uri.to_string().as_str()) {
         Ok(u) => u,
         Err(e) => {
             return response_err(response, e.to_string(), window).await;
@@ -92,7 +98,7 @@ pub async fn send_http_request(
 
     let m = Method::from_bytes(request.method.to_uppercase().as_bytes())
         .expect("Failed to create method");
-    let mut request_builder = client.request(m, url.clone());
+    let mut request_builder = client.request(m, url);
 
     let mut headers = HeaderMap::new();
     headers.insert(USER_AGENT, HeaderValue::from_static("yaak"));
diff --git a/src-web/components/ResponsePane.tsx b/src-web/components/ResponsePane.tsx
index 23840e63..69873e94 100644
--- a/src-web/components/ResponsePane.tsx
+++ b/src-web/components/ResponsePane.tsx
@@ -94,11 +94,6 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
         'shadow shadow-gray-100 dark:shadow-gray-0 relative',
       )}
     >
-      {activeResponse?.error && (
-        <Banner color="danger" className="m-2">
-          {activeResponse.error}
-        </Banner>
-      )}
       {!activeResponse && (
         <>
           <span />
@@ -107,7 +102,7 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
           />
         </>
       )}
-      {activeResponse && !activeResponse.error && !isResponseLoading(activeResponse) && (
+      {activeResponse && !isResponseLoading(activeResponse) && (
         <>
           <HStack
             alignItems="center"
@@ -149,37 +144,43 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
             )}
           </HStack>
 
-          <Tabs
-            value={activeTab}
-            onChangeValue={setActiveTab}
-            label="Response"
-            tabs={tabs}
-            className="ml-3 mr-1"
-            tabListClassName="mt-1.5"
-          >
-            <TabContent value="headers">
-              <ResponseHeaders response={activeResponse} />
-            </TabContent>
-            <TabContent value="body">
-              {!activeResponse.contentLength ? (
-                <EmptyStateText>Empty Body</EmptyStateText>
-              ) : contentType?.startsWith('image') ? (
-                <ImageViewer className="pb-2" response={activeResponse} />
-              ) : activeResponse.contentLength > 2 * 1000 * 1000 ? (
-                <div className="text-sm italic text-gray-500">
-                  Cannot preview text responses larger than 2MB
-                </div>
-              ) : viewMode === 'pretty' && contentType?.includes('html') ? (
-                <WebPageViewer response={activeResponse} />
-              ) : contentType?.match(/csv|tab-separated/) ? (
-                <CsvViewer className="pb-2" response={activeResponse} />
-              ) : (
-                // ) : contentType?.startsWith('application/json') ? (
-                //   <JsonViewer response={activeResponse} />
-                <TextViewer response={activeResponse} pretty={viewMode === 'pretty'} />
-              )}
-            </TabContent>
-          </Tabs>
+          {activeResponse?.error ? (
+            <Banner color="danger" className="m-2 mt-4">
+              {activeResponse.error}
+            </Banner>
+          ) : (
+            <Tabs
+              value={activeTab}
+              onChangeValue={setActiveTab}
+              label="Response"
+              tabs={tabs}
+              className="ml-3 mr-1"
+              tabListClassName="mt-1.5"
+            >
+              <TabContent value="headers">
+                <ResponseHeaders response={activeResponse} />
+              </TabContent>
+              <TabContent value="body">
+                {!activeResponse.contentLength ? (
+                  <EmptyStateText>Empty Body</EmptyStateText>
+                ) : contentType?.startsWith('image') ? (
+                  <ImageViewer className="pb-2" response={activeResponse} />
+                ) : activeResponse.contentLength > 2 * 1000 * 1000 ? (
+                  <div className="text-sm italic text-gray-500">
+                    Cannot preview text responses larger than 2MB
+                  </div>
+                ) : viewMode === 'pretty' && contentType?.includes('html') ? (
+                  <WebPageViewer response={activeResponse} />
+                ) : contentType?.match(/csv|tab-separated/) ? (
+                  <CsvViewer className="pb-2" response={activeResponse} />
+                ) : (
+                  // ) : contentType?.startsWith('application/json') ? (
+                  //   <JsonViewer response={activeResponse} />
+                  <TextViewer response={activeResponse} pretty={viewMode === 'pretty'} />
+                )}
+              </TabContent>
+            </Tabs>
+          )}
         </>
       )}
     </div>