Replaced throwing exceptions with error listener messages