Added null checks.
[emufront] / test