Fix info provider npe/2.2