Some more error checking, but mainly to reset the DB

Trying to track down some DB errors after it's pushed to Heroku...