diff --git a/changelog b/changelog
index 63e8483..4630f97 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,11 @@ TbaMUD is currently being developed by The Builder Academy. If you need any
 help, find any bugs, or have ideas for improvement please stop by TBA at 
 telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble
 @
+[Sep 08 2012] - Rumble
+  added another example to doc/syserr.txt
+  Added a !NPC check to can_take_object. It was spamming a "mob using player data SYSERR". This means mobs do not have a max weight carrying capacity anymore. I think this is a good thing because I've seen people stumped when mob triggers fail due to weig
+ht limitations. But it could be unbalancing on some MUDs since pets could then carry unlimited gear.
+  Uncommented code to prevent crashes when trying to save a deleted object.
 [Aug 22 2012] - Rumble
   bug: moved cedit load_config of no_mort_to_immort to its proper place. (thanks Liko)
 [Aug 12 2012] - Vatiken
diff --git a/doc/syserr.txt b/doc/syserr.txt
index b4cc687..c231a10 100644
--- a/doc/syserr.txt
+++ b/doc/syserr.txt
@@ -18,7 +18,9 @@ rumble@tbamud.com -- Rumble
 8.  Char is already equipped: (medit-s-desc), (oedit-s-desc)
 9.  SYSERR: Attempt to assign spec to non-existant mob #
 10. No associated object exists when attempting to create a board [vnum #]. 
-11. 11: SYSERR: Mob using >'((ch)-)player_specials....
+11. SYSERR: Mob using >'((ch)-)player_specials....
+12: SYSERR: Object # (keyword) is type NOTE and has extra description with
+    same name (keyword)
 
 1: Errant Rooms
 
@@ -106,4 +108,10 @@ know this is confusing, but just copy the example below.
 + if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOREPEAT)) // This line should be added without the "+"
 
 The changed line now will not just check for a flag, instead it will check if 
-it is a player (not an NPC) and it is flagged then continue. 
+it is a player (not an NPC) and it is flagged then continue.
+
+12: SYSERR: Object # (keyword) is type NOTE and has extra description with
+same name (keyword)
+
+Object type NOTE is meant to be written on using the action-description. So if
+you have an extra description with the same keyword it will never be viewable.
diff --git a/src/act.item.c b/src/act.item.c
index 6d183e6..2741acd 100644
--- a/src/act.item.c
+++ b/src/act.item.c
@@ -161,7 +161,7 @@ ACMD(do_put)
 
 static int can_take_obj(struct char_data *ch, struct obj_data *obj)
 {
-  if (!PRF_FLAGGED(ch, PRF_NOHASSLE)) {
+  if (!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
 	  if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch)) {
 		act("$p: you can't carry that many items.", FALSE, ch, obj, 0, TO_CHAR);
 		return (0);