diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
index 83e62640fd..bbfc5728ed 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
@@ -36,7 +36,6 @@ package sonia.scm.repository;
 //~--- non-JDK imports --------------------------------------------------------
 
 import org.eclipse.jgit.diff.DiffFormatter;
-import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.RepositoryCache;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
index 6735a72ba0..0ea8769c0f 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
@@ -275,11 +275,15 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
           scriptName = FILE_HOOK_PRE_RECEIVE;
         }
 
-        File hookScript = getHookScript(directory, scriptName);
-
-        if (hookScript != null)
+        if (scriptName != null)
         {
-          executeFileHook(rpack, rc, hookScript, oldId, newId, rc.getRefName());
+          File hookScript = getHookScript(directory, scriptName);
+
+          if (hookScript != null)
+          {
+            executeFileHook(rpack, rc, hookScript, oldId, newId,
+                            rc.getRefName());
+          }
         }
 
         fireHookEvent(rpack, rc, directory, oldId, newId, type);
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnChangesetViewer.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnChangesetViewer.java
index d5d540f171..14707be99a 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnChangesetViewer.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnChangesetViewer.java
@@ -49,7 +49,6 @@ import sonia.scm.util.Util;
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.File;
-import java.io.IOException;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmLogFilePropertyDefiner.java b/scm-webapp/src/main/java/sonia/scm/ScmLogFilePropertyDefiner.java
index b0d48ff71c..5c7a5b0004 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmLogFilePropertyDefiner.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmLogFilePropertyDefiner.java
@@ -62,9 +62,10 @@ public class ScmLogFilePropertyDefiner extends PropertyDefinerBase
     File logDirectory = new File(SCMContext.getContext().getBaseDirectory(),
                                  LOG_DIRECTORY);
 
-    if (!logDirectory.exists())
+    if (!logDirectory.exists() &&!logDirectory.mkdirs())
     {
-      logDirectory.mkdirs();
+      throw new ConfigurationException(
+          "could not create log directory ".concat(logDirectory.getPath()));
     }
 
     this.logDirectoryPath = logDirectory.getAbsolutePath();