diff --git a/scm-core/src/main/java/sonia/scm/BasicContextProvider.java b/scm-core/src/main/java/sonia/scm/BasicContextProvider.java
index 35dd2dcca0..f6507fc453 100644
--- a/scm-core/src/main/java/sonia/scm/BasicContextProvider.java
+++ b/scm-core/src/main/java/sonia/scm/BasicContextProvider.java
@@ -96,7 +96,7 @@ public class BasicContextProvider implements SCMContextProvider
       version = loadVersion();
       stage = loadProjectStage();
     }
-    catch (Throwable ex)
+    catch (Exception ex)
     {
       this.startupError = ex;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
index 52eead7956..95d6ce2575 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
@@ -190,7 +190,7 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
       p = Runtime.getRuntime().exec(execCmd, env.getEnvArray(), workDirectory);
       execute(p);
     }
-    catch (Throwable ex)
+    catch (IOException ex)
     {
       getExceptionHandler().handleException(request, response, ex);
     }