diff --git a/CHANGELOG.md b/CHANGELOG.md
index c88420407..49ad37fc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,6 +95,7 @@
 * Fixed an issue with moving androids getting stuck
 * Fixed Cargo nodes sometimes preventing chunks from unloading
 * Fixed #2081
+* Fixed a NullPointerException when Generators throw an Error Report
 
 ## Release Candidate 13 (16 Jun 2020)
 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13
diff --git a/README.md b/README.md
index 32fc24d49..b7ffc8315 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Here is a full summary of the differences between the two different versions of
 
 | | development (latest) | "stable" |
 | ------------------ | -------- | -------- |
-| **Minecraft version(s)** | :video_game: **1.13.\* - 1.16.\*** | :video_game: **1.13.\* - 1.15.\*** |
+| **Minecraft version(s)** | :video_game: **1.13.\* - 1.16.\*** | :video_game: **1.13.\* - 1.16.\*** |
 | **automatic updates** | :heavy_check_mark: | :heavy_check_mark: |
 | **frequent updates** | :heavy_check_mark: | :x: |
 | **latest content** | :heavy_check_mark: | :x: |
@@ -114,6 +114,8 @@ To compile Slimefun yourself, follow these steps:
 
 If you are already using an IDE, make sure to import the project via git and set it as a *Maven project*. Then you should be able build it via Maven using the goals `clean package`.
 
+If you have any further questions, then please join our [Discord Support Server](#discord) and ask your questions in the `#programming-help` channel. Note that we will not accept any bug reports from custom-compiled versions of Slimefun.
+
 ### Code Quality
 Slimefun uses [Sonarcloud.io](https://sonarcloud.io/dashboard?id=TheBusyBiscuit_Slimefun4) to monitor Code Quality.
 
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
index 70a5467c9..8175ca703 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
@@ -1,7 +1,6 @@
 package io.github.thebusybiscuit.slimefun4.api;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
@@ -92,7 +91,7 @@ public class ErrorReport {
 
                 addon.getLogger().log(Level.WARNING, "");
             }
-            catch (IOException x) {
+            catch (Exception x) {
                 addon.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving an Error-Report for Slimefun " + SlimefunPlugin.getVersion());
             }
         });
@@ -109,9 +108,19 @@ public class ErrorReport {
             stream.println("  Block Data: " + l.getBlock().getBlockData().getClass().getName());
             stream.println("  State: " + l.getBlock().getState().getClass().getName());
             stream.println();
-            stream.println("Ticker-Info:");
-            stream.println("  Type: " + (item.getBlockTicker().isSynchronized() ? "Synchronized" : "Asynchronous"));
-            stream.println();
+
+            if (item.getBlockTicker() != null) {
+                stream.println("Ticker-Info:");
+                stream.println("  Type: " + (item.getBlockTicker().isSynchronized() ? "Synchronized" : "Asynchronous"));
+                stream.println();
+            }
+            
+            if (item.getEnergyTicker() != null) {
+                stream.println("Ticker-Info:");
+                stream.println("  Type: Indirect (Energy Network)");
+                stream.println();
+            }
+
             stream.println("Slimefun Data:");
             stream.println("  ID: " + item.getID());
             stream.println("  Inventory: " + BlockStorage.getStorage(l.getWorld()).hasInventory(l));