crash on join fixed
one other location
Merge pull request #153 from reidbaker/crash_on_join

Crash on join