diff --git a/sphaira/source/utils/devoptab.cpp b/sphaira/source/utils/devoptab.cpp
index 6ba4108..2adffa0 100644
--- a/sphaira/source/utils/devoptab.cpp
+++ b/sphaira/source/utils/devoptab.cpp
@@ -258,6 +258,11 @@ void DisplayDevoptabSideBar() {
             items.emplace_back(GetTypeName(e));
         }
 
+        if (items.empty()) {
+            App::Notify("No mount entries found."_i18n);
+            return;
+        }
+
         App::Push<PopupList>("Modify Entry"_i18n, items, [configs](std::optional<s64> index){
             if (!index.has_value()) {
                 return;
@@ -278,6 +283,11 @@ void DisplayDevoptabSideBar() {
             items.emplace_back(GetTypeName(e));
         }
 
+        if (items.empty()) {
+            App::Notify("No mount entries found."_i18n);
+            return;
+        }
+
         App::Push<PopupList>("Delete Entry"_i18n, items, [configs](std::optional<s64> index){
             if (!index.has_value()) {
                 return;
diff --git a/sphaira/source/utils/devoptab_common.cpp b/sphaira/source/utils/devoptab_common.cpp
index 6d9ad7f..ed63809 100644
--- a/sphaira/source/utils/devoptab_common.cpp
+++ b/sphaira/source/utils/devoptab_common.cpp
@@ -1188,7 +1188,7 @@ bool MountCurlDevice::Mount() {
             log_write("[CURL] updated host: %s\n", url.c_str());
         }
 
-        const auto flags = CURLU_DEFAULT_SCHEME|CURLU_URLENCODE;
+        const auto flags = CURLU_GUESS_SCHEME|CURLU_URLENCODE;
         CURLUcode rc = curl_url_set(curlu, CURLUPART_URL, url.c_str(), flags);
         if (rc != CURLUE_OK) {
             log_write("[CURL] curl_url_set() failed: %s\n", curl_url_strerror_wrap(rc));