master - Better error reporting.