More updates to error reporting