error and messages updated