More potential crash fixes.