EM updated so no billing info returns null rather than an error