diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp
index 1c419bc1a9..985ae0441b 100644
--- a/src/openrct2/object/Object.cpp
+++ b/src/openrct2/object/Object.cpp
@@ -92,8 +92,10 @@ bool ObjectEntryDescriptor::operator==(const ObjectEntryDescriptor& rhs) const
     {
         return Entry == rhs.Entry;
     }
-
-    return Type == rhs.Type && Identifier == rhs.Identifier;
+    else
+    {
+        return Type == rhs.Type && Identifier == rhs.Identifier;
+    }
 }
 
 bool ObjectEntryDescriptor::operator!=(const ObjectEntryDescriptor& rhs) const
diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp
index f2e218b6fe..4663730a63 100644
--- a/src/openrct2/object/ObjectRepository.cpp
+++ b/src/openrct2/object/ObjectRepository.cpp
@@ -612,8 +612,10 @@ private:
             // Convert to UTF-8 filename
             return String::Convert(normalisedName, CODE_PAGE::CP_1252, CODE_PAGE::CP_UTF8);
         }
-
-        return std::string(name);
+        else
+        {
+            return std::string(name);
+        }
     }
 
     void WritePackedObject(OpenRCT2::IStream* stream, const rct_object_entry* entry)