Add final error reporting