Put guards on a bunch of exception-inducing code, as seen in logs from load test.
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim