diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 327e9031..30dc8b28 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -722,13 +722,8 @@ public class FactionsEntityListener implements Listener {
 		Entity entity = event.getRightClicked();
 
 		// only need to check for armor stand and item frames
-		if (entity.getType() != EntityType.ARMOR_STAND) {
-			return;
-		}
-
-		if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), entity.getLocation(), "use armor stands", false)) {
-			event.setCancelled(true);
-		}
+		if (entity == null || entity.getType() != EntityType.ARMOR_STAND ) return;
+		if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), entity.getLocation(), "use armor stands", false)) event.setCancelled(true);
 	}
 
 	private boolean stopEndermanBlockManipulation(Location loc) {
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index 4e50e3aa..6e2a609f 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -410,8 +410,9 @@ public class FactionsPlayerListener implements Listener {
     }
 
     public void enableFly(FPlayer me) {
-        if (SaberFactions.plugin.getConfig().getBoolean("ffly.AutoEnable")) {
+        if(!me.getPlayer().hasPermission("factions.fly")) return;
 
+        if (SaberFactions.plugin.getConfig().getBoolean("ffly.AutoEnable")) {
             me.setFlying(true);
             CmdFly.flyMap.put(me.getName(), true);
             if (CmdFly.id == -1) {
diff --git a/src/main/java/com/massivecraft/factions/util/ClipPlaceholderAPIManager.java b/src/main/java/com/massivecraft/factions/util/ClipPlaceholderAPIManager.java
index 033803a6..51cd3444 100644
--- a/src/main/java/com/massivecraft/factions/util/ClipPlaceholderAPIManager.java
+++ b/src/main/java/com/massivecraft/factions/util/ClipPlaceholderAPIManager.java
@@ -112,6 +112,8 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
 				return (faction.getOpen() ? TL.COMMAND_SHOW_UNINVITED.toString() : TL.COMMAND_SHOW_INVITATION.toString());
 			case "faction_peaceful":
 				return faction.isPeaceful() ? Conf.colorNeutral + TL.COMMAND_SHOW_PEACEFUL.toString() : "";
+			case "faction_tntbank_balance":
+				return String.valueOf(faction.getTnt());
 			case "faction_powerboost":
 				double powerBoost = faction.getPowerBoost();
 				return (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString() : TL.COMMAND_SHOW_PENALTY.toString() + powerBoost + ")");