possible crash hotfix

[p]Sorry for the crashes after the update, over the next week I'll be releasing small updates trying to fix any crushes or bugs that happen.

I've uploaded a build with some possible fixes, but it's not confirmed yet, so I'll appreciate any reports.[/p]