Fixed warning on null object