Improve error handling in argument blocks.