more error reporting changes