diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 8476b53..90c8530 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index 6fbf8a6..b904cbf 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -790,7 +790,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
 	}
 
 	private boolean ActiveF = false;
-	private int FCount = 0;
+	private int FCount = 0; // TODO: Change to rate
 	private MaybeOfflinePlayer FPlayer = null;
 	private Timer Ftimer;
 	public static int AlphaDeaths;
@@ -799,8 +799,9 @@ public class PlayerListener implements Listener { // 2015.07.16.
 	public void onPlayerDeath(PlayerDeathEvent e) {
 		if (e.getEntity().getName().equals("Alpha_Bacca44"))
 			AlphaDeaths++;
-		if (!Minigames.plugin.pdata.getMinigamePlayer(e.getEntity())
-				.isInMinigame() && new Random().nextBoolean()) {
+		MinigamePlayer mgp = Minigames.plugin.pdata.getMinigamePlayer(e
+				.getEntity());
+		if ((mgp != null && !mgp.isInMinigame()) && new Random().nextBoolean()) { //Don't store Fs for NPCs
 			if (Ftimer != null)
 				Ftimer.cancel();
 			ActiveF = true;
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class
index 6047ff5..53caf34 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class
index ce5ae63..be385af 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ