- Fixed ultimately rare NULL pointer access exception