r261 final fixes. Updates to Halloween items breaking, some null-pointer
catches, and a few more bugfixes.