diff --git a/2006Redone Server/src/com/rebotted/game/bots/BotHandler.java b/2006Redone Server/src/com/rebotted/game/bots/BotHandler.java
index 5f354fc6..3a1b6f94 100644
--- a/2006Redone Server/src/com/rebotted/game/bots/BotHandler.java	
+++ b/2006Redone Server/src/com/rebotted/game/bots/BotHandler.java	
@@ -32,7 +32,7 @@ public class BotHandler {
 
     public static void playerShop(Player player){
         // Must be in the correct zones
-        if (!player.inPlayerShopArea() && !player.inBankArea()) {
+        if (!player.inPlayerShopArea()) {
             player.getPacketSender().sendMessage("You need to be in a bank zone or trade area for this.");
             return;
         }
diff --git a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java
index ffc5271c..a8fed93f 100644
--- a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java	
+++ b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java	
@@ -2093,6 +2093,11 @@ public class ItemAssistant {
 
 	public void fromBank(int itemID, int fromSlot, int amount) {
 		boolean cantWithdrawCuzMaxStack = false;
+		if (c.lastMainFrameInterface != MainFrameIDs.BANK)
+		{
+			c.getPacketSender().sendMessage("Your bank isn't open!");
+			return;
+		}
 		if (amount > 0) {
 			if (c.bankItems[fromSlot] > 0) {
 			    if (c.getItemAssistant().playerHasItem(itemID))
diff --git a/2006Redone Server/src/com/rebotted/game/players/Player.java b/2006Redone Server/src/com/rebotted/game/players/Player.java
index 0fd2cc46..a8f74b4e 100644
--- a/2006Redone Server/src/com/rebotted/game/players/Player.java	
+++ b/2006Redone Server/src/com/rebotted/game/players/Player.java	
@@ -1757,6 +1757,7 @@ public abstract class Player {
                 isInArea(2530,4725,2550,4705) || //Phasmatys
 				isInArea(2834, 10215, 2841, 10204) || // Keldagrim
 				isInArea(2379, 4453, 2386, 4462) || // Zanaris
+				isInArea(2582, 3423, 2591, 3417) || //Fishing Guild
 				false;
 	}
 
diff --git a/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java b/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java
index a0fa218e..29cb5991 100644
--- a/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java	
+++ b/2006Redone Server/src/com/rebotted/game/shops/ShopAssistant.java	
@@ -344,6 +344,11 @@ public class ShopAssistant {
 			player.getPacketSender().sendMessage("Selling items as an admin has been disabled.");
 			return false;
 		}
+		if (!player.inPlayerShopArea()) //Packet abuse!
+		{
+			player.getPacketSender().sendMessage("You're not in a shopping area! Enter one to sell items & manage your store.");
+			return false;
+		}
 		if(!player.isShopping) {
 	        return false;
 		}
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/bots/BotHandler.class b/CompiledServer/production/2006rebotted/com/rebotted/game/bots/BotHandler.class
index 6bca0680..886d3cc3 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/bots/BotHandler.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/bots/BotHandler.class differ
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class
index 113be870..70f706fd 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class differ
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class b/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class
index 6113ac49..c0b5ea02 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/players/Player.class differ
diff --git a/CompiledServer/production/2006rebotted/com/rebotted/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/com/rebotted/game/shops/ShopAssistant.class
index d923d3ce..1df399c0 100644
Binary files a/CompiledServer/production/2006rebotted/com/rebotted/game/shops/ShopAssistant.class and b/CompiledServer/production/2006rebotted/com/rebotted/game/shops/ShopAssistant.class differ