Fixed missing NULL pointer checks
Missed a save
Yet another pointer