Sam raet 24 Added additional error messages