Put null-returns back in
Another try at an OAuth2 enabled DB and test