- Fixed ultimately rare NULL pointer access exception
- Fixed another possible NULL pointer access exception