diff --git a/Sora/Utils/Extensions/JavaScriptCore+Extensions.swift b/Sora/Utils/Extensions/JavaScriptCore+Extensions.swift
index 18f4d39..b5ddc34 100644
--- a/Sora/Utils/Extensions/JavaScriptCore+Extensions.swift
+++ b/Sora/Utils/Extensions/JavaScriptCore+Extensions.swift
@@ -162,7 +162,7 @@ extension JSContext {
                     if(method != "GET")
                     {
                         // Ensure body is properly serialized
-                        processedBody = body ? JSON.stringify(body) : null
+                        processedBody = (body && (typeof body === 'object')) ? JSON.stringify(body) : (body || null)
                     }
             
                         return new Promise(function(resolve, reject) {
diff --git a/Sora/Views/MediaInfoView/MediaInfoView.swift b/Sora/Views/MediaInfoView/MediaInfoView.swift
index dc28939..f4de2ad 100644
--- a/Sora/Views/MediaInfoView/MediaInfoView.swift
+++ b/Sora/Views/MediaInfoView/MediaInfoView.swift
@@ -738,7 +738,7 @@ struct MediaInfoView: View {
                     if let currTitle = streams[index]["title"] as? String
                     {
                         title = currTitle
-                        streamUrl = (streams[index]["streamUrl"] as? String)!
+                        streamUrl = (streams[index]["streamUrl"] as? String) ?? ""
                     }
                     else
                     {