diff --git a/AboutBox1.cs b/AboutBox1.cs
index ae5d3a3..fb0f568 100644
--- a/AboutBox1.cs
+++ b/AboutBox1.cs
@@ -37,7 +37,7 @@ namespace PDF_Merge
                         return titleAttribute.Title;
                     }
                 }
-                return Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().CodeBase);
+                return Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().Location);
             }
         }
 
@@ -45,7 +45,7 @@ namespace PDF_Merge
         {
             get
             {
-                return Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                return Assembly.GetExecutingAssembly()?.GetName()?.Version?.ToString();
             }
         }