Added additional error messages and stats