Catch Exception for no database connection
Merge branch 'Olson' of https://github.com/Geddy05/Dev05.git