Added some checks if the database is not available
Fixed setup, removed obsolete questionaire