diff --git a/launcher/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp
index ff2d37723..0220a4144 100644
--- a/launcher/InstanceCopyTask.cpp
+++ b/launcher/InstanceCopyTask.cpp
@@ -173,7 +173,11 @@ void InstanceCopyTask::copyFinished()
                 allowed_symlinks_file
                     .filePath());  // we dont want to modify the original. also make sure the resulting file is not itself a link.
 
-        FS::write(allowed_symlinks_file.filePath(), allowed_symlinks);
+        try {
+            FS::write(allowed_symlinks_file.filePath(), allowed_symlinks);
+        } catch (const FS::FileSystemException& e) {
+            qCritical() << "Failed to write symlink :" << e.cause();
+        }
     }
 
     emitSucceeded();
diff --git a/launcher/minecraft/skins/SkinList.cpp b/launcher/minecraft/skins/SkinList.cpp
index fd883ad52..017cb8dc2 100644
--- a/launcher/minecraft/skins/SkinList.cpp
+++ b/launcher/minecraft/skins/SkinList.cpp
@@ -336,7 +336,11 @@ void SkinList::save()
         arr << s.toJSON();
     }
     doc["skins"] = arr;
-    Json::write(doc, m_dir.absoluteFilePath("index.json"));
+    try {
+        Json::write(doc, m_dir.absoluteFilePath("index.json"));
+    } catch (const FS::FileSystemException& e) {
+        qCritical() << "Failed to write skin index file :" << e.cause();
+    }
 }
 
 int SkinList::getSelectedAccountSkin()
diff --git a/launcher/minecraft/skins/SkinModel.cpp b/launcher/minecraft/skins/SkinModel.cpp
index d53b9e762..937864e2c 100644
--- a/launcher/minecraft/skins/SkinModel.cpp
+++ b/launcher/minecraft/skins/SkinModel.cpp
@@ -41,7 +41,7 @@ SkinModel::SkinModel(QDir skinDir, QJsonObject obj)
 
 QString SkinModel::name() const
 {
-    return QFileInfo(m_path).baseName();
+    return QFileInfo(m_path).completeBaseName();
 }
 
 bool SkinModel::rename(QString newName)
diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp
index 1e0ae87a3..908743ab0 100644
--- a/launcher/ui/dialogs/ExportToModListDialog.cpp
+++ b/launcher/ui/dialogs/ExportToModListDialog.cpp
@@ -164,7 +164,12 @@ void ExportToModListDialog::done(int result)
 
         if (output.isEmpty())
             return;
-        FS::write(output, ui->finalText->toPlainText().toUtf8());
+
+        try {
+            FS::write(output, ui->finalText->toPlainText().toUtf8());
+        } catch (const FS::FileSystemException& e) {
+            qCritical() << "Failed to save mod list file :" << e.cause();
+        }
     }
 
     QDialog::done(result);
diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.cpp b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
index a947af632..6c85ffa96 100644
--- a/launcher/ui/dialogs/skins/SkinManageDialog.cpp
+++ b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
@@ -116,7 +116,7 @@ void SkinManageDialog::selectionChanged(QItemSelection selected, QItemSelection
         return;
     m_selected_skin = key;
     auto skin = m_list.skin(key);
-    if (!skin)
+    if (!skin || !skin->isValid())
         return;
     ui->selectedModel->setPixmap(skin->getTexture().scaled(size() * (1. / 3), Qt::KeepAspectRatio, Qt::FastTransformation));
     ui->capeCombo->setCurrentIndex(m_capes_idx.value(skin->getCapeId()));
@@ -212,7 +212,10 @@ void SkinManageDialog::setupCapes()
 void SkinManageDialog::on_capeCombo_currentIndexChanged(int index)
 {
     auto id = ui->capeCombo->currentData();
-    ui->capeImage->setPixmap(m_capes.value(id.toString(), {}).scaled(size() * (1. / 3), Qt::KeepAspectRatio, Qt::FastTransformation));
+    auto cape = m_capes.value(id.toString(), {});
+    if (!cape.isNull()) {
+        ui->capeImage->setPixmap(cape.scaled(size() * (1. / 3), Qt::KeepAspectRatio, Qt::FastTransformation));
+    }
     if (auto skin = m_list.skin(m_selected_skin); skin) {
         skin->setCapeId(id.toString());
     }
@@ -505,8 +508,13 @@ void SkinManageDialog::resizeEvent(QResizeEvent* event)
     QSize s = size() * (1. / 3);
 
     if (auto skin = m_list.skin(m_selected_skin); skin) {
-        ui->selectedModel->setPixmap(skin->getTexture().scaled(s, Qt::KeepAspectRatio, Qt::FastTransformation));
+        if (skin->isValid()) {
+            ui->selectedModel->setPixmap(skin->getTexture().scaled(s, Qt::KeepAspectRatio, Qt::FastTransformation));
+        }
     }
     auto id = ui->capeCombo->currentData();
-    ui->capeImage->setPixmap(m_capes.value(id.toString(), {}).scaled(s, Qt::KeepAspectRatio, Qt::FastTransformation));
+    auto cape = m_capes.value(id.toString(), {});
+    if (!cape.isNull()) {
+        ui->capeImage->setPixmap(cape.scaled(s, Qt::KeepAspectRatio, Qt::FastTransformation));
+    }
 }