diff --git a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java
index e5a213abc..2f52c18a5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/contexts/ContextManager.java
@@ -228,7 +228,7 @@ public abstract class ContextManager<T> {
                     throw new IllegalStateException(calculator.getClass() + " returned a null context set");
                 }
                 accumulator = ret;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 ContextManager.this.plugin.getLogger().warn("An exception was thrown by " + getCalculatorClass(calculator) + " whilst calculating the context of subject " + subject);
                 e.printStackTrace();
             }
@@ -248,7 +248,7 @@ public abstract class ContextManager<T> {
                     throw new IllegalStateException(calculator.getClass() + " returned a null context set");
                 }
                 accumulator = ret;
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 this.plugin.getLogger().warn("An exception was thrown by " + getCalculatorClass(calculator) + " whilst calculating static contexts");
                 e.printStackTrace();
             }