Fix null pointer errors.

PR#3394
2 files changed