Thank you, this fixed it, I cannot reproduce the crash no matter what I do with this fix in place.
EDIT: The prev_stable version also suffers this issue, but the fix also works there.
