Fix 2 possible NullPointer occurences
2 files changed