Fixing null ref.