diff --git a/AffdexMe/MainWindow.xaml.cs b/AffdexMe/MainWindow.xaml.cs
index 0ec7af0..a51392e 100644
--- a/AffdexMe/MainWindow.xaml.cs
+++ b/AffdexMe/MainWindow.xaml.cs
@@ -143,19 +143,15 @@ namespace AffdexMe
             if (String.IsNullOrEmpty(affdexClassifierDir))
             {
                 ShowExceptionAndShutDown("AFFDEX_DATA_DIR environment variable (Classifier Data Directory) is not set");
-            }
-            else 
-            {
-                classifierPath = affdexClassifierDir;
-            }
-
-            DirectoryInfo directoryInfo = new DirectoryInfo(classifierPath);
+            }
+
+            DirectoryInfo directoryInfo = new DirectoryInfo(affdexClassifierDir);
             if (!directoryInfo.Exists)
             {
                 ShowExceptionAndShutDown("AFFDEX_DATA_DIR (Classifier Data Directory) is set to an invalid folder location");
-            }
-
-            return classifierPath;
+            }
+
+            return affdexClassifierDir;
         }
 
         private String GetAffdexLicense()