Yes, I plan to revisit all these Provider methods and add better null protection too.  I'm also trying to keep the Provider isolated so it could be injected or overridden and set on DatabaseHelper or something.