Display more informative error message on database connection error
Some cleaning