Index: C:/Documents and Settings/Administrator/My Documents/eclipse/workspace/L2_GameServer_It_3/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- C:/Documents and Settings/Administrator/My Documents/eclipse/workspace/L2_GameServer_It_3/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(revision 829)
+++ C:/Documents and Settings/Administrator/My Documents/eclipse/workspace/L2_GameServer_It_3/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(working copy)
@@ -1068,8 +1068,10 @@
 			_log.warning("Attempted to remove unknown RecipeList: "+recipeId);
 
 		L2ShortCut[] allShortCuts = getAllShortCuts();
-		for (L2ShortCut sc : allShortCuts) {
-			if (sc.getId() == recipeId && sc.getType() == L2ShortCut.TYPE_RECIPE)
+
+		for (L2ShortCut sc : allShortCuts)
+		{
+			if (sc != null && sc.getId() == recipeId && sc.getType() == L2ShortCut.TYPE_RECIPE)
 				deleteShortCut(sc.getSlot(), sc.getPage());
 		}
 	}
@@ -5948,8 +5950,10 @@
 		
 
 		L2ShortCut[] allShortCuts = getAllShortCuts();
-		for (L2ShortCut sc : allShortCuts) {
-			if (sc.getId() == oldSkill.getId() && sc.getType() == L2ShortCut.TYPE_SKILL)
+
+		for (L2ShortCut sc : allShortCuts)
+		{
+			if (sc != null && sc.getId() == oldSkill.getId() && sc.getType() == L2ShortCut.TYPE_SKILL)
 				deleteShortCut(sc.getSlot(), sc.getPage());
 		}