Fix errors messages and missing  callback