- Fixed another possible NULL pointer access exception