New error messages and fixed Database