fixed null pointers
2 files changed