Fix possible NULL dereference