diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
index 4c8be9ecde..e8b6d2f4bf 100644
--- a/plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
@@ -319,13 +319,18 @@ public class WindowsHgInstaller extends AbstractHgInstaller
   private File getMercurialDirectory(String hgBinary)
   {
     File directory = null;
-    File hg = new File(hgBinary);
-
-    if (hg.exists() && hg.isFile())
+    
+    if ( Util.isNotEmpty(hgBinary) )
     {
-      directory = hg.getParentFile();
+      File hg = new File(hgBinary);
+
+      if (hg.exists() && hg.isFile())
+      {
+        directory = hg.getParentFile();
+      }
     }
-    else
+    
+    if ( directory == null )
     {
       directory = getMercurialDirectoryFromRegistry();
     }