diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
index 32584967b..b0a0e6906 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java
@@ -208,7 +208,7 @@ public class Analysis {
                 if (analysisTypes.contains(boolTot)) {
                     replaceMap.put(source.getPlaceholder(boolTot.getPlaceholderModifier()), AnalysisUtils.getBooleanTotal(boolTot, source, uuids));
                 }
-            } catch (NoClassDefFoundError | Exception e) {
+            } catch (Exception | NoClassDefFoundError | NoSuchFieldError e) {
                 Log.error("A PluginData-source caused an exception: " + source.getPlaceholder("").replace("%", ""));
 
                 Log.toLog(this.getClass().getName(), e);
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
index 4c99eddfe..b1d65a833 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java
@@ -105,7 +105,7 @@ public class AnalysisUtils {
                     return source.parseContainer("", "Wrong Analysistype specified: " + analysisType.name());
             }
             return source.parseContainer(analysisType.getModifier(), String.valueOf(total));
-        } catch (Exception | NoClassDefFoundError e) {
+        } catch (Exception | NoClassDefFoundError | NoSuchFieldError e) {
             return logPluginDataCausedError(source, e);
         }
     }
@@ -150,7 +150,7 @@ public class AnalysisUtils {
                     return source.parseContainer("Err ", "Wrong Analysistype specified: " + analysisType.name());
             }
             return source.parseContainer(analysisType.getModifier(), FormatUtils.cutDecimals(average));
-        } catch (Exception e) {
+        } catch (Exception | NoClassDefFoundError | NoSuchFieldError e) {
             return logPluginDataCausedError(source, e);
         }
     }
@@ -169,7 +169,7 @@ public class AnalysisUtils {
                         .collect(Collectors.toList());
                 long count = tempList.stream().filter(value -> value).count();
                 return source.parseContainer(analysisType.getModifier(), ((double) (count / tempList.size()) * 100) + "%");
-            } catch (Exception e) {
+            } catch (Exception | NoClassDefFoundError | NoSuchFieldError e) {
                 return logPluginDataCausedError(source, e);
             }
         }