Fixes (or covers up) the crash on Haunted House

See my email. This is probably just covering a deeper symptom.