More null checks.
0.6.4