null check fixed.