Fix missing NULL checks