Error prevention and database stuff
Merge pull request #38 from nelswad90/master

Error Prevention and database stuff