Add extra error reporting