Tamed wolves commit suicide too much

This is particularly annoying while having Tamed wolves follow you around the world. Wolves (and cats) will walk into cacti, will jump into lava, and will do a whole bunch of crap to kill themselves. IMO, the only way for these mobs to die should be while defending you. Otherwise it leaves the player feeling unsatisfied and unattached from their mobs.