Improve error diagnostics