Potential crash fixes.
Release 1.6.3.