Adding NPE checks
2 files changed