diff --git a/src/MassManager/MassManager.cpp b/src/MassManager/MassManager.cpp
index 033d279..1327781 100644
--- a/src/MassManager/MassManager.cpp
+++ b/src/MassManager/MassManager.cpp
@@ -111,7 +111,7 @@ auto MassManager::exportMass(int hangar) -> bool {
 
     std::string source = Utility::Directory::join(_saveDirectory, _hangars[hangar].filename());
     std::string dest = Utility::Directory::join(_stagingAreaDirectory,
-                                                Utility::formatString("{}_{}.sav", _hangars[hangar].name(), _steamId));
+                                                Utility::formatString("{}_{}.sav", *_hangars[hangar].name(), _steamId));
 
     if(!Utility::Directory::copy(source, dest)) {
         _lastError = Utility::formatString("Couldn't export data from hangar {:.2d} to {}", hangar, dest);
@@ -187,7 +187,7 @@ void MassManager::refreshStagedMasses() {
     file_list.erase(iter, file_list.end());
 
     for(const std::string& file : file_list) {
-        std::string name = Mass::getNameFromFile(Utility::Directory::join(_stagingAreaDirectory, file));
+        std::string name = *Mass::getNameFromFile(Utility::Directory::join(_stagingAreaDirectory, file));
 
         if(!name.empty()) {
             _stagedMasses[file] = name;