diff --git a/DisplayMagician/GameLibraries/OriginLibrary.cs b/DisplayMagician/GameLibraries/OriginLibrary.cs
index 0d96354..fd429b4 100644
--- a/DisplayMagician/GameLibraries/OriginLibrary.cs
+++ b/DisplayMagician/GameLibraries/OriginLibrary.cs
@@ -472,6 +472,12 @@ namespace DisplayMagician.GameLibraries
 
                             // Now we want to look in the dinstallpath location for the game info
                             // for the __Installer\installerdata.xml
+                            if (String.IsNullOrEmpty(originGame.GameInstallDir))
+                            {
+                                // then we have a problem and we need to continue and ignore this game
+                                logger.Warn($"OriginLibrary/LoadInstalledGames: Origin game with ID {originGame.GameID} has registry but we can't find install dir!");
+                                continue;
+                            }
 
                             string gameInstallerData = Path.Combine(originGame.GameInstallDir, @"__Installer", @"installerdata.xml");
 
@@ -603,7 +609,6 @@ namespace DisplayMagician.GameLibraries
 
                                 // If we reach here we add the Game to the list of games we have!
                                 _allOriginGames.Add(new OriginGame(originGame.GameID, originGame.GameName, originGame.GameExePath, originGame.GameIconPath));
-
                             }
                             else
                             {
diff --git a/DisplayMagician/GameLibraries/UplayLibrary.cs b/DisplayMagician/GameLibraries/UplayLibrary.cs
index 80de108..c79bc9a 100644
--- a/DisplayMagician/GameLibraries/UplayLibrary.cs
+++ b/DisplayMagician/GameLibraries/UplayLibrary.cs
@@ -600,6 +600,7 @@ namespace DisplayMagician.GameLibraries
                             }
                             else
                             {
+                                gotGameRegistryKey = false;
                                 logger.Trace($"UplayLibrary/LoadInstalledGames: Game with uplayEntryLines[{i}]: '{uplayEntryLines[i]}' not found");
                             }
                         }