Crash Fixes

Crash fixes for a few crash logs that have popped up in the latest pre-release.
This is a branch on the Quicksilver repo so if anybody else has any fixes they can push to it… :)